diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/dispatcher/CMSPage.java b/ccm-cms/src/main/java/com/arsdigita/cms/dispatcher/CMSPage.java
index 46c07fe02..9010a997e 100755
--- a/ccm-cms/src/main/java/com/arsdigita/cms/dispatcher/CMSPage.java
+++ b/ccm-cms/src/main/java/com/arsdigita/cms/dispatcher/CMSPage.java
@@ -285,7 +285,7 @@ public class CMSPage extends Page implements ResourceHandler {
         if (itemId != null) {
             final CdiUtil cdiUtil = CdiUtil.createCdiUtil();
             final ContentItemRepository itemRepo = cdiUtil.findBean(ContentItemRepository.class);
-            final ContentItem item = itemRepo.findById(Long.parseLong("item_id"));
+            final ContentItem item = itemRepo.findById(Long.parseLong("item_id")).get();
             final PermissionChecker permissionChecker = cdiUtil.findBean(
                 PermissionChecker.class);
             permissionChecker.checkPermission(CmsConstants.PRIVILEGE_ITEMS_PREVIEW, 
diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemRepository.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemRepository.java
index 1095afd96..fde4642e0 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemRepository.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemRepository.java
@@ -22,6 +22,7 @@ import org.libreccm.auditing.AbstractAuditedEntityRepository;
 import org.libreccm.categorization.Category;
 import org.libreccm.core.CcmObject;
 import org.libreccm.core.CcmObjectRepository;
+import org.librecms.contenttypes.Article;
 
 import java.util.List;
 import java.util.Optional;