diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/templates/RenderTemplateAction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/templates/RenderTemplateAction.java
index e8a19fc2..6e0c068a 100644
--- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/templates/RenderTemplateAction.java
+++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/templates/RenderTemplateAction.java
@@ -64,9 +64,12 @@ public class RenderTemplateAction extends AbstractQActionFunction<RenderTemplate
          Velocity.init();
          Context context = new VelocityContext();
 
-         for(Map.Entry<String, ?> entry : input.getContext().entrySet())
+         if(input.getContext() != null)
          {
-            context.put(entry.getKey(), entry.getValue());
+            for(Map.Entry<String, ?> entry : input.getContext().entrySet())
+            {
+               context.put(entry.getKey(), entry.getValue());
+            }
          }
 
          setupEventHandlers(context);