diff --git a/THANKS b/THANKS
index e7a52d71..bbb6f808 100644
--- a/THANKS
+++ b/THANKS
@@ -52,6 +52,9 @@ Michael Kukat <michael at unixiron.org>,
 Nicolas Boullis <nboullis at debian.org>
   Build issues, library symbol versioning, Debian packaging and issues
 
+Nigel Pearson nigel at ind dot tansu dot com dot au
+  OSX 10 fixes
+
 Patrick Guimond
   CD-Extra audio data boundaries
 
diff --git a/lib/driver/osx.c b/lib/driver/osx.c
index 3c1b35b2..bf6ebdf8 100644
--- a/lib/driver/osx.c
+++ b/lib/driver/osx.c
@@ -1833,6 +1833,11 @@ cdio_get_default_device_osx(void)
       
       do
         {
+          /* Skip other removable media, like USB flash memory keys:  */
+          if (!IOObjectConformsTo(next_media, kIODVDMediaClass) &&
+              !IOObjectConformsTo(next_media, kIOCDMediaClass))
+            continue;
+
           str_bsd_path = IORegistryEntryCreateCFProperty( next_media,
                                                           CFSTR( kIOBSDNameKey ),
                                                           kCFAllocatorDefault,
@@ -1863,6 +1868,7 @@ cdio_get_default_device_osx(void)
         } while( ( next_media = IOIteratorNext( media_iterator ) ) != 0 );
     }
   IOObjectRelease( media_iterator );
+  cdio_warn ("cdio_get_default_device() - No CD/DVD media - returning NULL");
   return NULL;
 #endif /* HAVE_DARWIN_CDROM */
 }