[NRRPLT-8070] More improvements in error handling of the refactorStorage script.

Approved-by: Vahid Zolfaghari