Added more protection for foolproofing Storage library.