Get try-catch into CmdletBase back
Merge pull request #2086 from ogail/storage

Get try-catch into CmdletBase back
Merge branch 'dev' into storage