Preemptive product removal fixes

Put in some checks to make sure that nothing screwy happens with the
product removal