diff --git a/server/src/routers/contacts-router.ts b/server/src/routers/contacts-router.ts
index 8d51d2b..d757d52 100644
--- a/server/src/routers/contacts-router.ts
+++ b/server/src/routers/contacts-router.ts
@@ -35,6 +35,12 @@
 
 contactsRouter.get('/:contactId', (req, res) => {
   const contactDetails = jamid.getContactDetails(res.locals.accountId, req.params.contactId);
+
+  if (Object.keys(contactDetails).length === 0) {
+    res.status(HttpStatusCode.NotFound).send('No such contact found');
+    return;
+  }
+
   res.send(contactDetails);
 });
 
@@ -45,6 +51,11 @@
   jamid.addContact(accountId, contactId);
 
   const contactDetails = jamid.getContactDetails(accountId, contactId);
+  if (Object.keys(contactDetails).length === 0) {
+    res.status(HttpStatusCode.NotFound).send('No such contact found');
+    return;
+  }
+
   res.send(contactDetails);
 });