Error handler improvement (when @ op. occurs)