Add checks when loading blob data
2 files changed