Merge "StorageManager: Improve exception handling"