Fix test and handle ConversionException
Merge pull request #1102 from erwinwinder/master

Fix test and handle ConversionException