Fix regression that causes Timeouts to return 500

When the hacking changes were put in, one of the exceptions that were
fixed didn't also add a catch for Timeout, which causes certain timeouts
to cause a 500 return

Change-Id: I7a9db200528303868d8a9ab05f35a70d99bfb118