Fixed null pointer exception
Merge branch 'master' of github.com:JunctionAt/Tier2