fixed better_errors
Merge branch 'hotfix/better_errors2'