diff --git a/fm-doc/fm_doc/parseEventYaml.py b/fm-doc/fm_doc/parseEventYaml.py
index e82bdeed..ce6fcb96 100755
--- a/fm-doc/fm_doc/parseEventYaml.py
+++ b/fm-doc/fm_doc/parseEventYaml.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016-2022 Wind River Systems, Inc.
+# Copyright (c) 2016-2023 Wind River Systems, Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -103,6 +103,10 @@ logFields = {
     context_FieldName: context_FieldValues
 }
 
+nonEmptyFields = {
+    context_FieldName
+}
+
 
 def checkField(fieldKey, fieldValues, key, event):
     if fieldKey not in event:
@@ -110,6 +114,10 @@ def checkField(fieldKey, fieldValues, key, event):
         return False
     # print("START: %s :END" % event[fieldKey])
 
+    if fieldKey in nonEmptyFields and not event[fieldKey]:
+        print("\n    ERROR: \'%s\' can not be empty." % (fieldKey))
+        return False
+
     if type(event[fieldKey]) is str:
         if not fieldValues:
             return True