updated the Exception messages a bit