MPS-19815 NPE while checkouting from git