[master][PATCH] Fix exception handling in rescue mode