Fix error handler behaviour in the presence of @