Further clone-proofing
Handled return values from external methods