Fix: git toolbar icon causing exceptions at boot

Fix: git toolbar icon causing exceptions at boot #2641