Fix ordering of rescue_from