fix NullPointerException
Merge branch 'master' of github.com:TeleportR/foo