Updated to include git exceptions