This Fixes #1061

Oops I didn't see this comment and committed again based on your previous feedback. 
I agree its ugly. I think we should have a common constant file to keep all static custom messages.