Changes after review. Modify exceptions for response