diff --git a/ccm-cms/src/com/arsdigita/cms/installer/xml/ContentTypeHelperImpl.java b/ccm-cms/src/com/arsdigita/cms/installer/xml/ContentTypeHelperImpl.java index 659daa3c3..6ffdf3f92 100755 --- a/ccm-cms/src/com/arsdigita/cms/installer/xml/ContentTypeHelperImpl.java +++ b/ccm-cms/src/com/arsdigita/cms/installer/xml/ContentTypeHelperImpl.java @@ -228,6 +228,9 @@ public class ContentTypeHelperImpl implements ContentTypeHelper { // Turn on search indexing for this type ObjectType type = SessionManager.getMetadataRoot().getObjectType( m_objectType); + if (type == null) { + throw new IllegalArgumentException(String.format("No object type for '%s'", m_objectType)); + } if (type.isSubtypeOf(ContentPage.BASE_DATA_OBJECT_TYPE) && !isInternal()) { s_log.debug("Registering search adapter for " diff --git a/ccm-sci-publicpersonalprofile/src/ccm-sci-publicpersonalprofile.load b/ccm-sci-publicpersonalprofile/src/ccm-sci-publicpersonalprofile.load index 2b35e6e0b..6ddfce203 100644 --- a/ccm-sci-publicpersonalprofile/src/ccm-sci-publicpersonalprofile.load +++ b/ccm-sci-publicpersonalprofile/src/ccm-sci-publicpersonalprofile.load @@ -16,6 +16,7 @@ +