Make the data storage honor all possible exceptions