[DO NOT REVIEW] Fixes #6957 - Show user friendly error message on 413