diff --git a/pykat/commands.py b/pykat/commands.py
index 4c486f81daed42fec32ef3832d7e12e15b512d37..ebe0db0ab574bb9c544406508cfea3627e45231b 100644
--- a/pykat/commands.py
+++ b/pykat/commands.py
@@ -66,13 +66,15 @@ class gauss(object):
             elif len(values) == 8:
                 gpx = gauss_param(z=values[-4], zr=values[-3])
                 gpy = gauss_param(z=values[-2], zr=values[-1])
-        else:
+        elif values[0].endswith("**"):
             if len(values) == 6:
                 gp = gauss_param(w=values[-2], rc=values[-1])
             elif len(values) == 8:
                 gpx = gauss_param(w=values[-4], rc=values[-3])
                 gpy = gauss_param(w=values[-2], rc=values[-1])
-        
+        else:
+            raise pkex.BasePyKatException("Unexpected ending to gauss command '{0}'".format(text))
+            
         if len(values) == 6:
             kat.nodes[node].setGauss(kat.components[component], gp)
         else: