Add pre-condition to detect invalid re-entry