CarServ 1.6.4: Fixed null pointer exception, do some refactoring