diff --git a/bluez/ubt b/bluez/ubt
index a314046af947f2ba8696c9a62aedae11aa05386b..bccc6abde693edb46bbfcb6ae8067d62b8f3a97b 100755
--- a/bluez/ubt
+++ b/bluez/ubt
@@ -464,7 +464,7 @@ class PbapDeviceProfileTester(DeviceProfileTester):
                 path = s[0]
                 break
         if not path:
-            raise
+            raise LookupError('Device ‘%s’ not found in services' % device_name)
 
         service = dbus.Interface(bus.get_object("net.connman", path),
                                  "net.connman.Service")
@@ -517,7 +517,7 @@ class PbapDeviceProfileTester(DeviceProfileTester):
             if ret == 'y' or ret == 'Y':
                 TEST_PASSED("A2DP Source")
             else:
-                raise
+                raise RuntimeError('Invalid response: ' + ret)
 
         except Exception as error:
             TEST_FAILED("A2DP Source: " + str(error))