phase1: fix crash on exception during Git update