diff --git a/KeyStroke.m b/KeyStroke.m
index 6d2f134..ffce303 100644
--- a/KeyStroke.m
+++ b/KeyStroke.m
@@ -94,11 +94,13 @@ - (void)setupSourcePopup
 		if(modelCheck != kMIDIUnknownProperty && pModel != nil) {
 			[mNum appendString:(NSString *)pModel];
 			[mNum appendString:@" "];
-		}
+        } else {
+            [mNum appendFormat:@"No-name Device #%d ", i];
+        }
         if( pName != nil ) {
 		  [mNum appendString:(NSString *)pName];
-		  [sourcePopup insertItemWithTitle:mNum atIndex:i+1];
         }
+        [sourcePopup insertItemWithTitle:mNum atIndex:i+1];
 	}
 	CFRelease(sourceArray);
 }