Fix to properly return path in certain circumstances. Added flag to disable local storage directory from being created.