added possible fix to crash when getting null back from databasePath
Merge remote-tracking branch 'remotes/origin/master'