Bug 1074633 - RFE: Manage storage node snapshots

avoid NPE