Removed exception cases as they are now handled in unit tests