The NotSupportedError should use HTTP return code 501, not 500. Change-Id: I40261a1636f0477d778a96f3d9625a5ce3b3252c