fixed null-pointer-exception
Merge branch 'master' of https://github.com/foundation-runtime/tools