Fix for working directory NPE