diff --git a/tests/modelling/test_term.py b/tests/modelling/test_term.py
index 41a2105e..5720eabd 100644
--- a/tests/modelling/test_term.py
+++ b/tests/modelling/test_term.py
@@ -15,7 +15,11 @@ from zipline.data.dataset import (
     Column,
     DataSet,
 )
-from zipline.errors import InputTermNotAtomic
+from zipline.errors import (
+    InputTermNotAtomic,
+    TermInputsNotSpecified,
+    WindowLengthNotSpecified,
+)
 from zipline.modelling.engine import build_dependency_graph
 from zipline.modelling.factor import Factor
 from zipline.modelling.expression import NUMEXPR_MATH_FUNCS
@@ -244,3 +248,26 @@ class ObjectIdentityTestCase(TestCase):
         for funcname in NUMEXPR_MATH_FUNCS:
             method = getattr(f, funcname)
             self.assertIs(method(), method())
+
+    def test_bad_input(self):
+
+        class SomeFactor(Factor):
+            pass
+
+        class SomeFactorDefaultInputs(Factor):
+            inputs = (SomeDataSet.foo, SomeDataSet.bar)
+
+        class SomeFactorDefaultLength(Factor):
+            window_length = 10
+
+        with self.assertRaises(TermInputsNotSpecified):
+            SomeFactor(window_length=1)
+
+        with self.assertRaises(TermInputsNotSpecified):
+            SomeFactorDefaultLength()
+
+        with self.assertRaises(WindowLengthNotSpecified):
+            SomeFactor(inputs=(SomeDataSet.foo,))
+
+        with self.assertRaises(WindowLengthNotSpecified):
+            SomeFactorDefaultInputs()
diff --git a/zipline/modelling/term.py b/zipline/modelling/term.py
index c680075b..c86d6353 100644
--- a/zipline/modelling/term.py
+++ b/zipline/modelling/term.py
@@ -214,10 +214,8 @@ class SingleInputMixin(object):
 
 class RequiredWindowLengthMixin(object):
     def _validate(self):
-        if self.windowed:
+        if self.windowed or self.window_length is NotSpecified:
             return super(RequiredWindowLengthMixin, self)._validate()
-        if self.window_length is NotSpecified:
-            raise WindowLengthNotSpecified()
         raise WindowLengthNotPositive(window_length=self.window_length)