Added error handling for AO/DD constraint exceptions