Fix a bug that could sometimes lead to fatal assert, aborting the pro…#12

frepe360 wants to merge 2 commits intowmanley:masterwmanley/cisco-vqe-client:masterfrom

frepe360:masterfrepe360/cisco-vqe-client:masterCopy head branch name to clipboard