catch ParameterException again :/
Merge pull request #927 from dwightguth/parameterexception

catch ParameterException again :/