current path refactoring, catch exceptions
Merge pull request #48 from lukaselmer/current-directory-improvements

current path refactoring, catch exceptions