CID-1254835 proxy can only be null in a special case
CID-1254834 secStorageVm can only be null in a special case
CID-1116546 Fix resource leak
Merge branch 'bugfix/CID-1254835'