Potentially fixed the null pointer Brad was getting