diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py
index bea9a1402..14f1a13e6 100644
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -668,6 +668,11 @@ class InterfaceConnection(models.Model):
     interface_b = models.OneToOneField('Interface', related_name='connected_as_b', on_delete=models.CASCADE)
     connection_status = models.BooleanField(choices=CONNECTION_STATUS_CHOICES, default=CONNECTION_STATUS_CONNECTED, verbose_name='Status')
 
+    def clean(self):
+
+        if self.interface_a == self.interface_b:
+            raise ValidationError("Cannot connect an interface to itself")
+
 
 class Module(models.Model):
     """
diff --git a/netbox/templates/dcim/interfaceconnection_edit.html b/netbox/templates/dcim/interfaceconnection_edit.html
index 8d9a9acd8..784fe3632 100644
--- a/netbox/templates/dcim/interfaceconnection_edit.html
+++ b/netbox/templates/dcim/interfaceconnection_edit.html
@@ -7,6 +7,18 @@
 <h1>Connect Interfaces</h1>
 <form action="." method="post" class="form form-horizontal">
 {% csrf_token %}
+<div class="row">
+    <div class="col-md-6 col-md-offset-3">
+        {% if form.non_field_errors %}
+            <div class="panel panel-danger">
+                <div class="panel-heading"><strong>Errors</strong></div>
+                <div class="panel-body">
+                    {{ form.non_field_errors }}
+                </div>
+            </div>
+        {% endif %}
+    </div>
+</div>
 <div class="row">
 	<div class="col-md-5">
         <div class="panel panel-default">