fixed NPE in when running client... DRIES!!!!