added null checking on server for when this damn this starts up...