fixed stupid null pointer :/
Merge branch 'Jarred'