Proper error messaging
Merge https://github.com/keshirkey/cerebro