Broke the single Exception out into two different checks and Exceptions to prevent confusion