Fixed NPE on server