Preliminary work on avoiding symlink null error