diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCampaignDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCampaignDto.java
index a6407be3be8..57c0407e786 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCampaignDto.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCampaignDto.java
@@ -108,8 +108,13 @@ private String resolveCurrentStateName(PageBase page) {
             case REVIEW_STAGE_DONE:
                 AccessCertificationStageType stage = CertCampaignTypeUtil.getCurrentStage(campaign);
                 String stageName = stage != null ? stage.getName() : null;
-                String key = createEnumResourceKey(state) + "_FULL";
-                return createStringResourceStatic(page, key, stageNumber, stageName).getString();
+                if (stageName != null) {
+					String key = createEnumResourceKey(state) + "_FULL";
+					return createStringResourceStatic(page, key, stageNumber, stageName).getString();
+				} else {
+					String key = createEnumResourceKey(state);
+					return createStringResourceStatic(page, key).getString() + " " + stageNumber;
+				}
             default:
                 return null;        // todo warning/error?
         }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/CertGuiHandlerRegistry.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/CertGuiHandlerRegistry.java
index f9d888b38ed..e2c71c9c76b 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/CertGuiHandlerRegistry.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/CertGuiHandlerRegistry.java
@@ -38,6 +38,8 @@ public CertGuiHandler getHandler(String uri) {
         switch (uri) {
             case AccessCertificationApiConstants.DIRECT_ASSIGNMENT_HANDLER_URI:
                 return new DirectAssignmentCertGuiHandler();
+            case AccessCertificationApiConstants.EXCLUSION_HANDLER_URI:
+                return new DirectAssignmentCertGuiHandler();        // TODO
             default:
                 throw new IllegalArgumentException("Unknown handler URI: " + uri);
         }