Fix an NPD when handle is overwritten with nil

[ankur22]

What?

Call the defer function with the non nil handle, and allow the handle to be overwritten later. Now the handle in the defer will still be non-nil.

Why?

Fixes an NPD.

Checklist

• I have performed a self-review of my code.
• I have added tests for my changes.
• I have run linter locally (make lint) and all checks pass.
• I have run tests locally (make tests) and all tests pass.
• I have commented on my code, particularly in hard-to-understand areas.

Related PR(s)/Issue(s)

Linked to: #4279