Fix Nullpointer Exception on server restart