Exception types corrected