diff --git a/app/mentorship/[mentorId]/page.tsx b/app/mentorship/[mentorId]/page.tsx
index 5b31b40..4b0f03d 100644
--- a/app/mentorship/[mentorId]/page.tsx
+++ b/app/mentorship/[mentorId]/page.tsx
@@ -57,11 +57,10 @@ export default function MentorDetailPage() {
             }}
             className="rounded-full w-64 aspect-square"
           />
-          <h2 className="text-2xl font-bold">{mentor?.name}</h2>
-          <h3 className="text-muted-foreground">{mentor?.email}</h3>
-          <p className="">
-            Discord: <span className="text-muted-foreground font-mono w-fit p-1 rounded-full text-sm">{mentor?.discordUsername}</span></p>
-          <p className="">Specialization: {mentor?.specialization.toUpperCase()}</p>
+          {mentor?.name && <h2 className="text-2xl font-bold">{mentor?.name}</h2>}
+          {mentor?.email && <h3 className="text-muted-foreground">{mentor?.email}</h3>}
+          {mentor?.discordUsername && <p className="">Discord: <span className="text-muted-foreground font-mono w-fit p-1 rounded-full text-sm">{mentor?.discordUsername}</span></p>}
+          {mentor?.specialization && <p className="">Specialization: {mentor?.specialization.toUpperCase()}</p>}
           <div>
             <p className="font-semibold text-muted-foreground">Intro</p>
             <p className="text-sm">{mentor?.intro}</p>
diff --git a/lib/firebase.ts b/lib/firebase.ts
index 2a88e7d..c27f243 100644
--- a/lib/firebase.ts
+++ b/lib/firebase.ts
@@ -1,6 +1,6 @@
 import { initializeApp } from 'firebase/app';
-import { getAuth, GoogleAuthProvider } from 'firebase/auth';
-import { getFirestore } from 'firebase/firestore';
+import { connectAuthEmulator, getAuth, GoogleAuthProvider } from 'firebase/auth';
+import { connectFirestoreEmulator, getFirestore } from 'firebase/firestore';
 import { getStorage } from 'firebase/storage';
 
 const firebaseConfig = {
@@ -30,4 +30,15 @@ googleProvider.setCustomParameters({
   hd: "garudahacks.com",
 });
 
+let emulatorsConnected = false;
+
+if (process.env.NEXT_PUBLIC_ENVIRONMENT === "development" && !emulatorsConnected) {
+  connectAuthEmulator(auth, "http://localhost:9099", {
+    disableWarnings: false,
+  });
+  connectFirestoreEmulator(db, "localhost", 8080);
+  emulatorsConnected = true;
+  console.log("Connected to Firebase emulators");
+}
+
 export default app;
diff --git a/lib/firebaseUtils.ts b/lib/firebaseUtils.ts
index b612c53..f9d3ab7 100644
--- a/lib/firebaseUtils.ts
+++ b/lib/firebaseUtils.ts
@@ -455,8 +455,8 @@ export async function fetchMentors(): Promise<FirestoreMentor[]> {
     });
 
     return users;
-  } catch {
-    throw new Error('Failed to fetch mentors');
+  } catch (error){
+    throw new Error(`Error when trying to fetch mentors: ${error}`);
   }
 }