diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 66396fe2eed19144cae5ca0c181bfada0ba0804f..e004bee27743c91bdd2db1b7ab460107cf976088 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -7,6 +7,7 @@ Changelog
 
 * Changed the APRS-IS config section to be named IGATE instead.
 * Output now displays IGATE as the source/destination instead of APRS-IS.
+* Made IGATE a reserved name in the configuration, it cannot be used for a TNC name.
 
 0.0.4
 -----
diff --git a/src/apex/cli.py b/src/apex/cli.py
index a8a673102fd4c45b656308c9b7f39d282203399e..88b9aa558097aab4ca33b22bc4b226c4644657b0 100644
--- a/src/apex/cli.py
+++ b/src/apex/cli.py
@@ -102,7 +102,10 @@ def configure(configfile, verbose=False):
         return
     for section in config.sections():
         if section.startswith("TNC "):
-            tnc_name = section.split(" ")[1]
+            tnc_name = section.strip().split(" ")[1].strip()
+            if tnc_name is 'IGATE':
+                echo_colorized_error('IGATE was used as the name for a TNC in the configuration, this name is reserved')
+                return
             if config.has_option(section, 'com_port') and config.has_option(section, 'baud'):
                 com_port = config.get(section, 'com_port')
                 baud = config.get(section, 'baud')