Remove error-handler