Baseball null pointer fix