OS-6 Removing previous change to allow 500 errors to be processed.