fix null pointer exception in the Comasters stuff