Removing the identifier.
Correct the lookup of the working directory to do a null check.