diff --git a/omod/src/main/webapp/patientDashboardForm.jsp b/omod/src/main/webapp/patientDashboardForm.jsp
index e77d6da5..927248b2 100644
--- a/omod/src/main/webapp/patientDashboardForm.jsp
+++ b/omod/src/main/webapp/patientDashboardForm.jsp
@@ -82,6 +82,19 @@
 		}
 		return false;
     }
+	
+	//hide the feature(concepts that are not defined either by property or value).
+	window.onload = function showOrHide() {
+		if(GlobalProperty("concept.causeOfDeath", "5002", "Concept id of the concept defining the CAUSE OF DEATH concept")) {
+			document.getElementById("patientDashboardDeceased").style.display = "none";
+		}
+	
+		else {
+			document.getElementById("patientDashboardDeceased").style.display = "block";
+		}
+	}
+	
+	
 </script>
 
 <c:if test="${patient.voided}">
@@ -98,6 +111,8 @@
 				&nbsp;&nbsp;&nbsp;&nbsp;
 				<openmrs:message code="Person.deathDate"/>: <openmrs:formatDate date="${patient.deathDate}"/>
 			</c:if>
+			<%--removed global concept id and property:causeOfDeath --%>
+			
 			<c:if test="${not empty patient.causeOfDeath}">
 				&nbsp;&nbsp;&nbsp;&nbsp;
 				<openmrs:message code="Person.causeOfDeath"/>: <openmrs:format concept="${patient.causeOfDeath}"/>
diff --git a/omod/src/main/webapp/portlets/patientOverview.jsp b/omod/src/main/webapp/portlets/patientOverview.jsp
index a8636e49..ad0fd74a 100644
--- a/omod/src/main/webapp/portlets/patientOverview.jsp
+++ b/omod/src/main/webapp/portlets/patientOverview.jsp
@@ -35,6 +35,29 @@
 			</td>
 		</tr>
 	</table>
+	<%--script to handle the missing properties,GP --%>>
+	
+	<script>
+	
+	window.onload = function handleMissingProperrties(){
+		var propertyValue = new GlobalProperty(globalProperty);
+		var outcomeType = dwr.util.getValue("reasonForExit");
+		if(outcomeType == ''){
+			alert("<openmrs:message code="Patient.outcome.error.noType" />");
+			return;
+		}
+		
+		else if( propertyValue === "undefined"){
+	    	
+	    	document.getElementById("patientActionsCauseOfDeath").style.display = "none";
+	    	return;
+	    }
+	    	
+	}
+	
+	
+	
+	</script>
 	<!--Copied from OpenMRS core 1.9.13
 	See https://github.com/openmrs/openmrs-core/blob/1.9.13/webapp/src/main/webapp/WEB-INF/view/portlets/patientOverview.jsp#L36
 	  -->
@@ -42,11 +65,12 @@
 		<openmrs:extensionPoint pointId="org.openmrs.patientDashboard.patientActionsContent" type="html" parameters="patientId=${model.patient.patientId}"/> 
 	   <c:if test="${exitFromCareEnabled}">
 		<tr class="patientActionsRow">
+		<%-- removed global property--%>
 		<openmrs:globalProperty key="concept.reasonExitedCare" var="reasonExitedCare" />
 		<c:if test="${empty model.patientReasonForExit && !empty reasonExitedCare}">
 			<td id="patientActionsOutcome">
 				<div id="patientActionsOutcomeLink">					
-					<button id="cancelExitButton" onClick="return showExitForm();"><openmrs:message code="Patient.outcome.exitFromCare"/></button>
+					<button id="cancelExitButton" onClick="handleMissingProperrties();"><openmrs:message code="Patient.outcome.exitFromCare"/></button>
 				</div>
 				<div id="patientActionsOutcomeForm" style="display:none; padding: 3px; border: 1px black dashed">
 					<form method="post" id="exitForm">
@@ -58,6 +82,8 @@
 								</td>
 								<td id="patientActionsCauseOfDeath" style="display:none;">
 									<span id="patientOutcomeTextDeathCause"><openmrs:message code="Person.causeOfDeath"/></span>
+									<%-- removed global properties--%>
+									
 									<openmrs:globalProperty key="concept.causeOfDeath" var="conceptCauseOfDeath" />
 									<openmrs:globalProperty key="concept.otherNonCoded" var="conceptOther" />
 									<openmrs:fieldGen type="org.openmrs.Concept" formFieldName="causeOfDeath" val="${status.value}" parameters="showAnswers=${conceptCauseOfDeath}|showOther=${conceptOther}|otherValue=${causeOfDeathOther}" />