feat: Added few more checks
to enhance the codebase.
#22974
Merged
checks
to enhance the codebase.
#22974