Mended exceptions somewhat