(fix) #noticket Change returns for storage API so errors can be handled outside