Should no longer crash server on exception