CLC-3424 Fix ordering of rescue_from (more specific should come after more general)
NOJIRA Fix bad exception syntax
Instead of correctly raising an ArgumentError exception, the old code triggers "undefined method `ArgumentError'"
CLC-3424 Do not rescue generic Exception
Merge pull request #2408 from raydavis/raywip

CLC-3424 Do not rescue generic Exception