fixed NullPointerException
Merge branch 'master' of https://github.com/srang/devilFiler