Adding checks to avoid null pointer exceptions if storage information is absent on the host.
Merge pull request #5 from zaheena/gradle

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