added handling for new exception