Improvement/handle namespace deletion on finalizer gracefully

Improvement/handle namespace deletion on finalizer gracefully #3594