Issue #1372122 by klausi, sun, beejeebus, juampy, mradcliffe: Fixed STOP the registry integrity constraint violation nightmare.