In  the rare case that the commitId is null, handle it gracefully