SIO-1255 HTTP 500 handler doesn't work

Change-Id: I6793a2328383c0ef28305540d286323530e31766
Merge "SIO-1255 HTTP 500 handler doesn't work"