Merge "Check that classes are loaded before updating entrypoints."