diff --git a/community/www/courses/course.html b/community/www/courses/course.html
index e08396fc..a95bb8ec 100644
--- a/community/www/courses/course.html
+++ b/community/www/courses/course.html
@@ -96,7 +96,7 @@
 					<button class="btn btn-dark btn-enroll float-right" data-course="{{ course.name }}">Enroll</button>
 				{% endif %} -->
 				<h2 class="course-title" data-course={{ course.name | urlencode }}>{{ course.title }}</h2>
-				{{course.short_introduction}}
+				{% if course.short_introduction %} {{course.short_introduction}} {% endif %}
 			</div>
 			{% if course.video_link %}
 			<div>
@@ -192,10 +192,12 @@
 			</div>
 		</div>
 		{% endif %}
+		{% if course.description %}
 		<div>
 			<h4 class="margin-bottom mt-5">About the Course</h4>
 			<div class="p-5"> {{frappe.utils.md_to_html(course.description)}} </div>
 		</div>
+		{% endif %}
 		<div class="margin-bottom">
 			<h4 class="margin-bottom">Instructor</h4>
 			<div class="d-flex align-items-center">
@@ -208,6 +210,7 @@
 				</div>
 			</div>
 		</div>
+		{% if mentors %}
 		<div class="margin-bottom">
 			<h4 class="margin-bottom">Mentors</h4>
 			<div class="d-flex">
@@ -229,6 +232,7 @@
 				{% endfor %}
 			</div>
 		</div>
+		{% endif %}
 		{% if not is_mentor %}
 		<div class="pt-5 mentor-request">
 			Interested to mentor this course? <span class="apply-now" data-course={{course.name | urlencode}}
diff --git a/community/www/courses/course.py b/community/www/courses/course.py
index d911bbe9..57f8a9d0 100644
--- a/community/www/courses/course.py
+++ b/community/www/courses/course.py
@@ -65,7 +65,12 @@ def get_membership(batches):
     return memberships
 
 def get_instructor(owner):
-    instructor = frappe.get_doc("Community Member", {"email": owner})
+    instructor = frappe._dict()
+    try:
+        instructor = frappe.get_doc("Community Member", {"email": owner})
+    except frappe.DoesNotExistError:
+        instructor.full_name = owner
+        instructor.abbr = ("").join([ s[0] for s in owner.split() ])
     instructor.course_count = len(frappe.get_all("LMS Course", {"owner": owner}))
     return instructor
 
diff --git a/community/www/courses/index.html b/community/www/courses/index.html
index bed70209..02a982dd 100644
--- a/community/www/courses/index.html
+++ b/community/www/courses/index.html
@@ -27,7 +27,9 @@
 <div class="card mb-5 w-100">
   <div class="card-body">
     <h5 class="card-title"><a href="/courses/{{course.slug}}">{{course.title}}</a></h5>
+    {% if course.description %}
     <p class="card-text">{{ frappe.utils.md_to_html(course.description[:250]) }}</p>
+    {% endif %}
     <a href="/courses/{{course.slug}}" class="card-link">See more &rarr;</a>
   </div>
 </div>