fixed null pointer exception when directory not exists
Merge origin/master