Fix issue where script stops after committing

Change-Id: I3e20a385aeedf2a71f60c44d5b001afe097cba98