Stefan Salowsky - 2010-10-20

Added check for empty parameters