diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index 4cd92ca12..39422c265 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -65,6 +65,9 @@ def parse_alphanumeric_range(string):
values.append(begin)
# Range-based
else:
+ # Not a valid range (more than a single character)
+ if not len(begin) == len(end) == 1:
+ raise forms.ValidationError('Range "{}" is invalid.'.format(dash_range))
for n in list(range(ord(begin), ord(end) + 1)):
values.append(chr(n))
return values
@@ -486,6 +489,7 @@ class ExpandableNameField(forms.CharField):
'Mixed cases and types within a single range are not supported.
' \
'Examples:
ge-0/0/[0-23,25,30]
e[0-3][a-d,f]
[xe,ge]-0/0/0
e[0-3,a-d,f]