a couple better checks in the clone handler