diff --git a/ccm-sci-bundle/src/com/arsdigita/bundle/ui/GenericOrgaUnitTabComponent.java b/ccm-sci-bundle/src/com/arsdigita/bundle/ui/GenericOrgaUnitTabComponent.java
index c96bfa392..97dbff075 100644
--- a/ccm-sci-bundle/src/com/arsdigita/bundle/ui/GenericOrgaUnitTabComponent.java
+++ b/ccm-sci-bundle/src/com/arsdigita/bundle/ui/GenericOrgaUnitTabComponent.java
@@ -59,7 +59,8 @@ public class GenericOrgaUnitTabComponent extends AbstractComponent {
GenericOrganizationalUnit orgaunit =
(GenericOrganizationalUnit) DomainObjectFactory.
newInstance(orgaunitOid);
- if (!DispatcherHelper.getDispatcherPrefix(request).equals("preview")) {
+ if ((DispatcherHelper.getDispatcherPrefix(request) == null)
+ || !DispatcherHelper.getDispatcherPrefix(request).equals("preview")) {
orgaunit = (GenericOrganizationalUnit) orgaunit.getLiveVersion();
}
diff --git a/ccm-sci-publications/src/ccm-sci-publications.upgrade b/ccm-sci-publications/src/ccm-sci-publications.upgrade
index 75ed4ddf1..1d7981863 100644
--- a/ccm-sci-publications/src/ccm-sci-publications.upgrade
+++ b/ccm-sci-publications/src/ccm-sci-publications.upgrade
@@ -2,4 +2,7 @@
+
+
+
\ No newline at end of file
diff --git a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteProjectsTab.java b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteProjectsTab.java
index 8e036b5c8..3ba565e4a 100644
--- a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteProjectsTab.java
+++ b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteProjectsTab.java
@@ -96,7 +96,7 @@ public class SciInstituteProjectsTab implements GenericOrgaUnitTab {
final HttpServletRequest request = state.getRequest();
final Element depProjectsElem = parent.newChildElement(
- "departmentProjects");
+ "instituteProjects");
final Element filtersElem = depProjectsElem.newChildElement(
"filters");
diff --git a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTab.java b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTab.java
index ad91e00c3..91e224d36 100644
--- a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTab.java
+++ b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTab.java
@@ -66,6 +66,7 @@ public class SciInstituteSummaryTab implements GenericOrgaUnitTab {
final long start = System.currentTimeMillis();
if ((department != null)
+ && (department.getInstituteShortDescription() != null)
&& !department.getInstituteShortDescription().trim().isEmpty()) {
final Element shortDescElem = parent.newChildElement("shortDesc");
shortDescElem.setText(department.getInstituteShortDescription());