cool error message added
Merge branch 'coolpeoplebranch'