Align error handler with the sample app
Merge pull request #820 from priand/playground

Align error handler with the sample app