Simplified the way the Storage exception being caught