Switch from catching InvalidRequestError to a more general SQLAlchemyError. Pushed a few more sqla ops into a try/catch block