build: first attempt at error catching and fixing for git cherry-picking