From 98a562c20e2add40c34973ed1be95f167120c10f Mon Sep 17 00:00:00 2001
From: Night Owl <sepulkarium45@yahoo.com>
Date: Sun, 2 Jul 2017 21:17:51 +0500
Subject: [PATCH] Merge
 https://github.com/SamVanheer/HLEnhanced/commit/9d2ae368aae3207dc9f66aca8a3c1505d5c3014a

---
 dlls/scientist.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/scientist.cpp b/dlls/scientist.cpp
index d7659c61..7cf9cc4d 100644
--- a/dlls/scientist.cpp
+++ b/dlls/scientist.cpp
@@ -464,7 +464,10 @@ void CScientist::StartTask( Task_t *pTask )
 		{
 			Talk( 2 );
 			m_hTalkTarget = m_hEnemy;
-			if( m_hEnemy->IsPlayer() )
+
+			//The enemy can be null here. - Solokiller
+			//Discovered while testing the barnacle grapple on headcrabs with scientists in view.
+			if( m_hEnemy && m_hEnemy->IsPlayer() )
 				PlaySentence( "SC_PLFEAR", 5, VOL_NORM, ATTN_NORM );
 			else
 				PlaySentence( "SC_FEAR", 5, VOL_NORM, ATTN_NORM );