Added better error message
Merge branch 'master' into backbone