Corrects NPE on working directory check and uses UUID for secondary ID. Change-Id: I1ff55053a576fbfc83a013cf4a557e10c1ca64a6