Fix specs, handle_exception calls