Changed NPE fix

Turns out the original fix didn't catch the NPE thrown here after I did a different test (while team info is loading, switch orientation. Gives same error and location). Changed where the null check is, should be good now.