Fixed error handlers
Merge branch 'master' into lefilasoi