[jh] stop 500 Server errors