Fixed issue with panics in server.