Reinstate blunt error handling