diff --git a/pykat/components.py b/pykat/components.py
index 2f38226f918e21b53c9fa8c39f70726d2dcec6fb..06360796b9969f7cebe76927d6df57c59f4e2560 100644
--- a/pykat/components.py
+++ b/pykat/components.py
@@ -1101,8 +1101,10 @@ class modulator(Component):
     def type(self): return self.__type
     @type.setter
     def type(self, value):
-        if value != "am" and value != "pm":
-            raise pkex.BasePyKatException("Modulator type must be am (amplitude modulation) or pm (phase modulation)")
+        accepted = ["am", "pm", "yaw", "pitch"]
+        
+        if value not in accepted:
+            raise pkex.BasePyKatException("Modulator type must be: " + ", ".join(accepted))
             
         self.__type = str(value)