diff --git a/frontend/src/components/CourseCardOverlay.vue b/frontend/src/components/CourseCardOverlay.vue
index 56f2bca2..630faadc 100644
--- a/frontend/src/components/CourseCardOverlay.vue
+++ b/frontend/src/components/CourseCardOverlay.vue
@@ -46,6 +46,12 @@
 					</span>
 				</Button>
 			</router-link>
+			<div
+				v-else-if="course.data.disable_self_learning"
+				class="bg-blue-100 text-blue-900 text-sm rounded-md py-1 px-3"
+			>
+				{{ __('Contact the Administrator to enroll for this course.') }}
+			</div>
 			<Button
 				v-else
 				@click="enrollStudent()"
diff --git a/frontend/src/components/Modals/DiscussionModal.vue b/frontend/src/components/Modals/DiscussionModal.vue
index 52500fe3..95873e02 100644
--- a/frontend/src/components/Modals/DiscussionModal.vue
+++ b/frontend/src/components/Modals/DiscussionModal.vue
@@ -38,7 +38,8 @@
 </template>
 <script setup>
 import { Dialog, Input, TextEditor, createResource } from 'frappe-ui'
-import { reactive, defineModel } from 'vue'
+import { reactive, defineModel, computed } from 'vue'
+import { showToast } from '@/utils'
 
 const topics = defineModel('reloadTopics')
 
@@ -93,6 +94,14 @@ const submitTopic = (close) => {
 	topicResource.submit(
 		{},
 		{
+			validate() {
+				if (!topic.title) {
+					return 'Title cannot be empty.'
+				}
+				if (!topic.reply) {
+					return 'Reply cannot be empty.'
+				}
+			},
 			onSuccess(data) {
 				replyResource.submit(
 					{
@@ -108,6 +117,9 @@ const submitTopic = (close) => {
 					}
 				)
 			},
+			onError(err) {
+				showToast('Error', err.message, 'x')
+			},
 		}
 	)
 }
diff --git a/frontend/src/pages/BatchCreation.vue b/frontend/src/pages/BatchCreation.vue
index 71731e50..a8f3881e 100644
--- a/frontend/src/pages/BatchCreation.vue
+++ b/frontend/src/pages/BatchCreation.vue
@@ -244,7 +244,7 @@ const newBatch = createResource({
 		return {
 			doc: {
 				doctype: 'LMS Batch',
-				meta_image: batch.image.file_url,
+				meta_image: batch.image?.file_url,
 				...batch,
 			},
 		}
@@ -279,7 +279,7 @@ const editBatch = createResource({
 			doctype: 'LMS Batch',
 			name: props.batchName,
 			fieldname: {
-				meta_image: batch.image.file_url,
+				meta_image: batch.image?.file_url,
 				...batch,
 			},
 		}
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index 83b3e2c9..be52a40d 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -1208,6 +1208,7 @@ def get_course_details(course):
 			"short_introduction",
 			"published",
 			"upcoming",
+			"disable_self_learning",
 			"published_on",
 			"status",
 			"paid_course",