Fix reading/writing errors with storages

Change-Id: I4229a4a68ba9813eb7a1fe794d402ff76127725f