Some checks depend on the directory existing

Change-Id: I6bba10e9e0f37c400b489ed5fb7451e00f67a5e0