Change back to Exception for InvalidContent