Added construction of storage into try-catch block