Merge "Fix crash for uncaught exception in MetadataLoader"