diff --git a/Tools/px4params/srcparser.py b/Tools/px4params/srcparser.py
index c4f1b54e43..b4ad401a9d 100644
--- a/Tools/px4params/srcparser.py
+++ b/Tools/px4params/srcparser.py
@@ -284,6 +284,9 @@ class SourceParser(object):
         for group in self.GetParamGroups():
             for param in group.GetParams():
                 name  = param.GetName()
+                if len(name) > 16:
+                    sys.stderr.write("Parameter Name {0} is too long (Limit is 16)\n".format(name))
+                    return False
                 board = param.GetFieldValue("board")
                 # Check for duplicates
                 name_plus_board = name + "+" + board