cleaner error msg
Merge branch 'kamikaze'