Adding checks to avoid null pointer exceptions if storage information is absent on the host.