diff --git a/source/java/org/alfresco/repo/action/executer/LinkCategoryActionExecuter.java b/source/java/org/alfresco/repo/action/executer/LinkCategoryActionExecuter.java
index ab38432a6d..74f7255888 100644
--- a/source/java/org/alfresco/repo/action/executer/LinkCategoryActionExecuter.java
+++ b/source/java/org/alfresco/repo/action/executer/LinkCategoryActionExecuter.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.action.ParameterDefinitionImpl;
 import org.alfresco.service.cmr.action.Action;
@@ -125,6 +126,12 @@ public class LinkCategoryActionExecuter extends ActionExecuterAbstractBase
                     }
                 }
                 
+                // Check that the category property is not null
+                if (categoryProperty == null)
+                {
+                    throw new AlfrescoRuntimeException("The category aspect " + categoryAspect.toPrefixString() + " does not have a category property to set.");
+                }
+                
                 if (categoryAspect != null)
                 {
                     if (this.nodeService.hasAspect(actionedUponNodeRef, categoryAspect) == false)