Corrected the exception message for an ExceptionHandler and made particular scenarios throw more appropriate exceptions, based on Review by rcook.