Add a null check when loading file from content provider to prevent crash
bump version to 2.3.1b2
@branch-specific