diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
index 2dcd859cf4..907c6c2b90 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
@@ -1104,17 +1104,20 @@ public class DispositionServiceImpl extends    ServiceBaseImpl
         if (nextDispositionAction != null)
         {
             NextActionFromDisposition dsNextAction = getNextDispositionAction(record, recordFolders, nextDispositionAction);
-            final NodeRef action = dsNextAction.getNextActionNodeRef();
-            final Date dispositionActionDate = dsNextAction.getNextActionDateAsOf();
-            AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
+            if (dsNextAction != null)
             {
-                @Override
-                public Void doWork()
+                final NodeRef action = dsNextAction.getNextActionNodeRef();
+                final Date dispositionActionDate = dsNextAction.getNextActionDateAsOf();
+                AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
                 {
-                    nodeService.setProperty(action, PROP_DISPOSITION_AS_OF, dispositionActionDate);
-                    return null;
-                }
-            });
+                    @Override
+                    public Void doWork()
+                    {
+                        nodeService.setProperty(action, PROP_DISPOSITION_AS_OF, dispositionActionDate);
+                        return null;
+                    }
+                });
+            }
         }
     }