Raise a more specific exception and fix the message here