Proper guard on freeStorage