Internal storage: improve exception handling