FIX Code 500 on unexpected errors instead of the original