Add error handler, fixes #199
Fix feedback
Add tests and fix issue with array_merge