diff --git a/atemOSC/ConnectionView.mm b/atemOSC/ConnectionView.mm
index 478e16e..cce106d 100644
--- a/atemOSC/ConnectionView.mm
+++ b/atemOSC/ConnectionView.mm
@@ -185,6 +185,19 @@ - (void)controlTextDidEndEditing:(NSNotification *)notification
 	
 	else if (textField == nicknameTextField)
 	{
+		AppDelegate* appDel = (AppDelegate *) [[NSApplication sharedApplication] delegate];
+		for (Switcher *s : [appDel switchers])
+		{
+			if (s.nickname != nil && [textField stringValue].length > 0 && [s.nickname isEqualToString: [textField stringValue]])
+			{
+				NSAlert *alert = [[NSAlert alloc] init];
+				[alert setMessageText:@"Duplicate Nickname"];
+				[alert setInformativeText:@"Please assign a unique nickname to each switcher"];
+				[alert beginSheetModalForWindow:[[NSApplication sharedApplication] mainWindow] completionHandler:nil];
+				[textField setStringValue:switcher.nickname];
+				return;
+			}
+		}
 		[switcher setNickname: [textField stringValue]];
 		[[window addressesView] loadFromSwitcher:[self switcher]];
 	}
diff --git a/atemOSC/MainWindow.xib b/atemOSC/MainWindow.xib
index 0cec97c..5c6dbe1 100644
--- a/atemOSC/MainWindow.xib
+++ b/atemOSC/MainWindow.xib
@@ -31,21 +31,21 @@
                                 <autoresizingMask key="autoresizingMask"/>
                                 <subviews>
                                     <splitView arrangesAllSubviews="NO" dividerStyle="thin" vertical="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hbP-PI-rWL">
-                                        <rect key="frame" x="0.0" y="0.0" width="739" height="384"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="739" height="381"/>
                                         <subviews>
                                             <customView misplaced="YES" id="c6t-hY-D42">
-                                                <rect key="frame" x="0.0" y="0.0" width="201" height="384"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="201" height="381"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                 <subviews>
                                                     <scrollView fixedFrame="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="14" horizontalPageScroll="10" verticalLineScroll="14" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ex6-Po-zXB">
-                                                        <rect key="frame" x="0.0" y="0.0" width="201" height="384"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="201" height="381"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <clipView key="contentView" drawsBackground="NO" id="VuF-QT-esb">
-                                                            <rect key="frame" x="0.0" y="0.0" width="201" height="384"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="201" height="381"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
                                                                 <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" multipleSelection="NO" autosaveColumns="NO" rowHeight="12" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="16" outlineTableColumn="Bk4-ha-QIR" id="kdj-9C-FUF" customClass="OutlineView">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="201" height="384"/>
+                                                                    <rect key="frame" x="0.0" y="0.0" width="201" height="381"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                     <size key="intercellSpacing" width="3" height="2"/>
                                                                     <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -233,21 +233,21 @@
                                                 </constraints>
                                             </customView>
                                             <view misplaced="YES" id="LYf-Sb-C76">
-                                                <rect key="frame" x="202" y="0.0" width="537" height="384"/>
+                                                <rect key="frame" x="202" y="0.0" width="537" height="381"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                 <subviews>
                                                     <tabView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qQr-eF-HVH">
-                                                        <rect key="frame" x="13" y="10" width="511" height="360"/>
+                                                        <rect key="frame" x="13" y="10" width="511" height="357"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <font key="font" metaFont="system"/>
                                                         <tabViewItems>
                                                             <tabViewItem label="Connection" identifier="" id="Xa4-9Z-KGV">
                                                                 <view key="view" id="FG4-sE-8eR" customClass="ConnectionView">
-                                                                    <rect key="frame" x="10" y="33" width="491" height="314"/>
+                                                                    <rect key="frame" x="10" y="33" width="491" height="311"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                     <subviews>
                                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rsk-ec-R48">
-                                                                            <rect key="frame" x="18" y="277" width="129" height="16"/>
+                                                                            <rect key="frame" x="18" y="274" width="129" height="16"/>
                                                                             <constraints>
                                                                                 <constraint firstAttribute="width" constant="125" id="gNz-J2-HA6"/>
                                                                             </constraints>
@@ -258,7 +258,7 @@
                                                                             </textFieldCell>
                                                                         </textField>
                                                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aH6-ln-IOY">
-                                                                            <rect key="frame" x="153" y="275" width="120" height="21"/>
+                                                                            <rect key="frame" x="153" y="272" width="120" height="21"/>
                                                                             <constraints>
                                                                                 <constraint firstAttribute="width" constant="120" id="xd8-1j-ZXo"/>
                                                                             </constraints>
@@ -272,7 +272,7 @@
                                                                             </connections>
                                                                         </textField>
                                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2aj-g5-mpE">
-                                                                            <rect key="frame" x="52" y="219" width="95" height="16"/>
+                                                                            <rect key="frame" x="52" y="216" width="95" height="16"/>
                                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Product Name:" id="mXJ-YZ-zKh">
                                                                                 <font key="font" metaFont="system"/>
                                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -280,7 +280,7 @@
                                                                             </textFieldCell>
                                                                         </textField>
                                                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7Rt-En-IXJ">
-                                                                            <rect key="frame" x="153" y="217" width="300" height="21"/>
+                                                                            <rect key="frame" x="153" y="214" width="300" height="21"/>
                                                                             <constraints>
                                                                                 <constraint firstAttribute="width" constant="300" id="Bg2-he-sbA"/>
                                                                             </constraints>
@@ -291,7 +291,7 @@
                                                                             </textFieldCell>
                                                                         </textField>
                                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Of8-BF-DsM">
-                                                                            <rect key="frame" x="79" y="192" width="68" height="16"/>
+                                                                            <rect key="frame" x="79" y="189" width="68" height="16"/>
                                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Nickname:" id="8xs-mo-smj">
                                                                                 <font key="font" metaFont="system"/>
                                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -299,7 +299,7 @@
                                                                             </textFieldCell>
                                                                         </textField>
                                                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9JT-rY-o0q">
-                                                                            <rect key="frame" x="153" y="190" width="100" height="21"/>
+                                                                            <rect key="frame" x="153" y="187" width="100" height="21"/>
                                                                             <constraints>
                                                                                 <constraint firstAttribute="width" constant="100" id="0bA-WB-wa0"/>
                                                                             </constraints>
@@ -313,15 +313,15 @@
                                                                             </connections>
                                                                         </textField>
                                                                         <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="8pu-Fg-k2w">
-                                                                            <rect key="frame" x="151" y="142" width="322" height="42"/>
-                                                                            <textFieldCell key="cell" selectable="YES" title="If you are connected to multiple switchers, the nickname will be used to identify which switcher to send incoming commands to" id="z7e-ZU-zgm">
+                                                                            <rect key="frame" x="151" y="139" width="322" height="42"/>
+                                                                            <textFieldCell key="cell" selectable="YES" title="If you are connected to multiple switchers, the nickname will be used to identify which switcher to route incoming commands to" id="z7e-ZU-zgm">
                                                                                 <font key="font" metaFont="smallSystem"/>
                                                                                 <color key="textColor" name="systemGrayColor" catalog="System" colorSpace="catalog"/>
                                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                             </textFieldCell>
                                                                         </textField>
                                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="M6a-e2-H9J">
-                                                                            <rect key="frame" x="18" y="107" width="179" height="16"/>
+                                                                            <rect key="frame" x="18" y="104" width="179" height="16"/>
                                                                             <textFieldCell key="cell" lineBreakMode="clipping" title="Send feedback messages to:" id="asm-wz-E2g">
                                                                                 <font key="font" metaFont="system"/>
                                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -329,7 +329,7 @@
                                                                             </textFieldCell>
                                                                         </textField>
                                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sr7-uj-kyI">
-                                                                            <rect key="frame" x="18" y="76" width="73" height="16"/>
+                                                                            <rect key="frame" x="18" y="73" width="73" height="16"/>
                                                                             <textFieldCell key="cell" lineBreakMode="clipping" title="IP Address:" id="A3U-9y-UV6">
                                                                                 <font key="font" metaFont="system"/>
                                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -337,7 +337,7 @@
                                                                             </textFieldCell>
                                                                         </textField>
                                                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9ph-kG-AW6">
-                                                                            <rect key="frame" x="97" y="74" width="120" height="21"/>
+                                                                            <rect key="frame" x="97" y="71" width="120" height="21"/>
                                                                             <constraints>
                                                                                 <constraint firstAttribute="width" constant="120" id="mI4-F4-bqu"/>
                                                                             </constraints>
@@ -351,7 +351,7 @@
                                                                             </connections>
                                                                         </textField>
                                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XUb-bR-TaN">
-                                                                            <rect key="frame" x="241" y="76" width="34" height="16"/>
+                                                                            <rect key="frame" x="241" y="73" width="34" height="16"/>
                                                                             <textFieldCell key="cell" lineBreakMode="clipping" title="Port:" id="S6G-oU-Xxl">
                                                                                 <font key="font" metaFont="system"/>
                                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -359,7 +359,7 @@
                                                                             </textFieldCell>
                                                                         </textField>
                                                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="see-xD-flM">
-                                                                            <rect key="frame" x="281" y="74" width="60" height="21"/>
+                                                                            <rect key="frame" x="281" y="71" width="60" height="21"/>
                                                                             <constraints>
                                                                                 <constraint firstAttribute="width" constant="60" id="r1e-Tu-uhD"/>
                                                                             </constraints>
@@ -377,7 +377,7 @@
                                                                             </connections>
                                                                         </textField>
                                                                         <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="dfj-ux-1hL">
-                                                                            <rect key="frame" x="18" y="24" width="455" height="42"/>
+                                                                            <rect key="frame" x="18" y="21" width="455" height="42"/>
                                                                             <textFieldCell key="cell" selectable="YES" id="LW2-oq-aIY">
                                                                                 <font key="font" metaFont="smallSystem"/>
                                                                                 <string key="title">Feedback messages are OSC messages that reflect the current state of the switcher.  They are sent when any value on the switcher is changed by atemOSC or any other application, such as ATEM Software Control.</string>
@@ -386,7 +386,7 @@
                                                                             </textFieldCell>
                                                                         </textField>
                                                                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9Va-f6-4OX">
-                                                                            <rect key="frame" x="275" y="268" width="92" height="32"/>
+                                                                            <rect key="frame" x="275" y="265" width="92" height="32"/>
                                                                             <buttonCell key="cell" type="push" title="Connect" bezelStyle="rounded" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="cHr-oV-BJA">
                                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                                 <font key="font" metaFont="system"/>
@@ -396,7 +396,7 @@
                                                                             </connections>
                                                                         </button>
                                                                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WO7-qA-Ucz">
-                                                                            <rect key="frame" x="151" y="251" width="158" height="18"/>
+                                                                            <rect key="frame" x="151" y="248" width="158" height="18"/>
                                                                             <buttonCell key="cell" type="check" title="Connect automatically" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="uEP-Lr-U91">
                                                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                                                 <font key="font" metaFont="system"/>
diff --git a/atemOSC/OSCReceiver.mm b/atemOSC/OSCReceiver.mm
index 8f7043c..6f879b1 100644
--- a/atemOSC/OSCReceiver.mm
+++ b/atemOSC/OSCReceiver.mm
@@ -1014,20 +1014,29 @@ - (void) receivedOSCMessage:(OSCMessage *)m
 	}
 	else
 	{
-		// If no nickname included in address or nickname does not match any switcher, default to first switcher with no nickname
+		// If no nickname included in address or nickname does not match any switcher, default to first connected switcher with no nickname
 		for (Switcher *s : [appDel switchers])
 		{
-			if (!s.nickname || s.nickname.length == 0)
+			if ((!s.nickname || s.nickname.length == 0) && s.isConnected)
 			{
 				if (switcher != nil)
-					return [appDel logMessage:[NSString stringWithFormat:@"[Error] Multiple switchers with no nickname, so not sure where to route message.  If you connect multiple switchers, you must assign nicknames so that messages can be routed correctly."]];
+					return [appDel logMessage:[NSString stringWithFormat:@"[Error] Multiple connected switchers with no nickname, so not sure where to route message.  If you connect multiple switchers, you must assign nicknames so that messages can be routed correctly."]];
 				else
 					switcher = s;
 			}
 		}
 		if (!switcher)
 		{
-			return [appDel logMessage:[NSString stringWithFormat:@"[Error] Could not determine switcher for command '%@'.  If your switcher has a nickname, you must either include the nickname in the address, or delete the nickname if this is the only switcher connected.", [m address]]];
+			BOOL anySwitcherConnected = NO;
+			for (Switcher *s : [appDel switchers])
+			{
+				if (s.isConnected)
+					anySwitcherConnected = YES;
+			}
+			if (anySwitcherConnected)
+				return [appDel logMessage:[NSString stringWithFormat:@"[Error] Could not determine switcher for command '%@'.  If your switcher has a nickname, you must either include the nickname in the address, or delete the nickname if this is the only switcher connected.", [m address]]];
+			else
+				return [appDel logMessage:[NSString stringWithFormat:@"[Error] Cannot process command '%@' because no switcher is connected", [m address]]];
 		}
 	}
 	
diff --git a/atemOSC/Switcher.mm b/atemOSC/Switcher.mm
index a018248..f0e6549 100644
--- a/atemOSC/Switcher.mm
+++ b/atemOSC/Switcher.mm
@@ -102,8 +102,10 @@ - (void)updateFeedback
 {
 	if (feedbackIpAddress != nil && feedbackPort > 0)
 	{
+		// Make sure each out port has a unique label, otherwise createNewOutputToAddress will return nil
+		NSString *label = [NSString stringWithFormat:@"atemOSC (%@)", self.nickname != nil ? self.nickname : self.ipAddress];
 		if (outPort == nil)
-			outPort = [appDel.manager createNewOutputToAddress:feedbackIpAddress atPort:feedbackPort withLabel:@"atemOSC"];
+			outPort = [appDel.manager createNewOutputToAddress:feedbackIpAddress atPort:feedbackPort withLabel:label];
 		else
 		{
 			if (![feedbackIpAddress isEqualToString: [outPort addressString]])
diff --git a/atemOSC/atemOSC.xcodeproj/project.pbxproj b/atemOSC/atemOSC.xcodeproj/project.pbxproj
index 2740ed0..a43a3f2 100644
--- a/atemOSC/atemOSC.xcodeproj/project.pbxproj
+++ b/atemOSC/atemOSC.xcodeproj/project.pbxproj
@@ -347,7 +347,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = LRNWZB2D4D;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -388,7 +388,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = LRNWZB2D4D;
 				ENABLE_HARDENED_RUNTIME = YES;