Follow-up to f0b7099a10 Closes #8011
f0b7099a10
... to prevent a lingering pointer that would lead to a double-free. Added test 1939 to verify. Reported-by: Stephen M. Coakley Fixes #7982 Closes #7986