Null pointer removed
Merge branch 'FIXING' of github.com:gametechnology/psi-2013 into FIXING