Quick error handlers fix
Merge branch 'master' into lefilasoi