diff --git a/engine/server/application/ConnectionServer/src/linux/main.cpp b/engine/server/application/ConnectionServer/src/linux/main.cpp
index 1e3dccfa..0bc0d1a3 100755
--- a/engine/server/application/ConnectionServer/src/linux/main.cpp
+++ b/engine/server/application/ConnectionServer/src/linux/main.cpp
@@ -61,6 +61,10 @@ int main(int argc, char ** argv)
 	NetworkHandler::remove();
 	SetupSharedFoundation::remove();
 	SetupSharedThread::remove();
+
+#ifdef ENABLE_PROFILING
+	exit(0);
+#endif
 	
 	return 0;
 }
diff --git a/engine/server/application/PlanetServer/src/linux/main.cpp b/engine/server/application/PlanetServer/src/linux/main.cpp
index db59c7e6..fff64b5e 100755
--- a/engine/server/application/PlanetServer/src/linux/main.cpp
+++ b/engine/server/application/PlanetServer/src/linux/main.cpp
@@ -74,5 +74,9 @@ int main(int argc, char ** argv)
 	SetupSharedFoundation::remove();
 	SetupSharedThread::remove();
 
+#ifdef ENABLE_PROFILING
+	exit(0);
+#endif
+
 	return 0;
 }
diff --git a/engine/server/library/serverGame/src/shared/ai/AggroListProperty.cpp b/engine/server/library/serverGame/src/shared/ai/AggroListProperty.cpp
index e06b0d40..a6071aa9 100755
--- a/engine/server/library/serverGame/src/shared/ai/AggroListProperty.cpp
+++ b/engine/server/library/serverGame/src/shared/ai/AggroListProperty.cpp
@@ -79,6 +79,7 @@ bool AggroListPropertyNamespace::canAttackTarget(TangibleObject const & attacker
 	{
 		//LOGC(AiLogManager::isLogging(attacker), "debug_ai", ("AggroListPropertyNamespace::canAttackTarget() attacker(%s) target(%s) Target is feigning death", attacker.getDebugInformation().c_str(), target.getDebugInformation().c_str()));
 		result = false;
+
 	}
 	else if (isInPlayerBuilding(target))
 	{
diff --git a/game/server/application/SwgDatabaseServer/src/linux/main.cpp b/game/server/application/SwgDatabaseServer/src/linux/main.cpp
index a08ab7b6..e006ffb0 100755
--- a/game/server/application/SwgDatabaseServer/src/linux/main.cpp
+++ b/game/server/application/SwgDatabaseServer/src/linux/main.cpp
@@ -80,5 +80,9 @@ int main(int argc, char ** argv)
 	SetupSharedFoundation::remove();
 	SetupSharedThread::remove();
 
+#ifdef ENABLE_PROFILING
+	exit(0);
+#endif
+
 	return 0;
 }
diff --git a/game/server/application/SwgGameServer/src/linux/main.cpp b/game/server/application/SwgGameServer/src/linux/main.cpp
index 7a875f74..9fcbfb4a 100755
--- a/game/server/application/SwgGameServer/src/linux/main.cpp
+++ b/game/server/application/SwgGameServer/src/linux/main.cpp
@@ -142,6 +142,10 @@ int main(int argc, char ** argv)
 	SetupSharedFoundation::remove();
 	SetupSharedThread::remove ();
 
+#ifdef ENABLE_PROFILING
+	exit(0);
+#endif
+
 	return 0;
 }