diff --git a/edivorce/apps/core/templatetags/composites.py b/edivorce/apps/core/templatetags/composites.py
index eb3f31a7..432755df 100644
--- a/edivorce/apps/core/templatetags/composites.py
+++ b/edivorce/apps/core/templatetags/composites.py
@@ -1,5 +1,7 @@
-import sys
-
+"""
+Template tags that output composite results based on context that includes the
+users full responses.
+"""
 from django import template
 
 from .format_utils import date_formatter
@@ -8,15 +10,14 @@ register = template.Library()
 
 
 @register.simple_tag(takes_context=True)
-def effective_date(context, *args, **kwargs):
+def effective_date(context):
     """ Returns the effective date of the divorce, based on user's answers """
 
     effective = 'the 31st day after the date of this order'
-    if context['responses']['divorce_take_effect_on'] == 'specific date':
-        date = context['responses']['divorce_take_effect_on_specific_date']
+    if context['responses'].get('divorce_take_effect_on', '') == 'specific date':
+        date = context['responses'].get('divorce_take_effect_on_specific_date', '')
         if date == '':
             effective = '<span class="form-entry not-complete"></span>'
         else:
             effective = date_formatter(date)
     return effective
-