bugfix for current dir not home, bugfix for nonexistent storage location