Fix F/C caused by uncaught IllegalArgumentException (fixes issue #1)