Fix for TRQ-1885 - server crash on startup.