Added a case to Exception (not sure if correct)