AMI-545 Properly respond to an error