* DataStorage - switched all of the Exceptions to the new ones