12531 storage: NULL pointer errors
Reviewed by: Patrick Mooney <pmooney@pfmooney.com>
Approved by: Robert Mustacchi <rm@fingolfin.org>

6745433 Merge NWS consolidation into OS/Net consolidation