diff --git a/lib/api-functions.js b/lib/api-functions.js
index 5e5a853..e28b620 100644
--- a/lib/api-functions.js
+++ b/lib/api-functions.js
@@ -209,6 +209,7 @@ function connectionRequest(deviceId, callback) {
 
   db.devicesCollection.findOne({ _id: deviceId }, proj, (err, device) => {
     if (err) return void callback(err);
+    if (!device) return void callback(new Error("No such device"));
 
     let managementServer,
       connectionRequestUrl,