cleanup some catch/throw logic.  rails 4 compat.