diff --git a/pyghmi/ipmi/oem/generic.py b/pyghmi/ipmi/oem/generic.py
index ba71b761..6bb176d9 100644
--- a/pyghmi/ipmi/oem/generic.py
+++ b/pyghmi/ipmi/oem/generic.py
@@ -278,7 +278,8 @@ class OEMHandler(object):
         raise exc.UnsupportedFunctionality()
 
     def upload_media(self, filename, progress, data):
-        raise exc.UnsupportedFunctionality()
+        raise exc.UnsupportedFunctionality(
+            'Remote media upload not supported on this system')
 
     def list_media(self):
         raise exc.UnsupportedFunctionality()