Embarrassing exception handling fix