diff --git a/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp
index 7529726f..fbc7b761 100755
--- a/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp
+++ b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp
@@ -653,7 +653,7 @@ static void transferBank(const NetworkId &source, const NetworkId &dest, int32 a
 	}
 	else
 	{
-//		printf("Transfering %i bank from %Ld to %Ld\n", (int)amount, source.getValue(), dest.getValue());
+//		printf("Transfering %i bank from %Ld to %Ld", (int)amount, source.getValue(), dest.getValue());
 		char buf[100];
 		sprintf(buf, "%Ld %Ld", (int64)dest.getValue(), (int64)amount);
 		MessageToQueue::getInstance().sendMessageToC(source, "C++ModifyBank", buf, 0, true);
@@ -1102,7 +1102,7 @@ void CommoditiesMarket::install()
 	if (!ConfigServerGame::getCommoditiesMarketEnabled())
 		return;
 
-	FATAL(s_market, ("CommoditiesMarket already installed.\n"));
+	FATAL(s_market, ("CommoditiesMarket already installed."));
 	getCommoditiesServerConnection();
 	time_t t = time(0);
 	
@@ -1112,7 +1112,7 @@ void CommoditiesMarket::install()
 	}
 	else
 	{
-		DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send SetGameTime.\n"));
+		DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send SetGameTime."));
 		
 		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 	}
@@ -1127,7 +1127,7 @@ void CommoditiesMarket::remove()
 	if (!ConfigServerGame::getCommoditiesMarketEnabled())
 		return;
 
-	//FATAL(!s_market, ("CommoditiesMarket not installed.\n"));
+	//FATAL(!s_market, ("CommoditiesMarket not installed."));
 	try
 	{
 		s_market = 0;
@@ -1181,7 +1181,7 @@ void CommoditiesMarket::giveTime()
 		if (Clock::timeSeconds() - ConfigServerGame::getCommoditiesServerReconnectIntervalSec() > reconnectTime)
 		{
 
-			DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send GiveTime.\n"));
+			DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send GiveTime."));
 			
 			getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 			reconnectTime = Clock::timeSeconds();
@@ -1393,7 +1393,7 @@ void CommoditiesMarket::onAddAuction(int sequence, int32 result, const NetworkId
 			}	
 			else
 			{
-				DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send CancelAuction.\n"));
+				DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send CancelAuction."));
 				getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 			}
 		}
@@ -1509,7 +1509,7 @@ void CommoditiesMarket::auctionCreate(CreatureObject &owner, ServerObject &item,
 		}
 		else
 		{
-			DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send AddAuction.\n"));
+			DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send AddAuction."));
 			
 			getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 		}
@@ -1581,7 +1581,7 @@ void CommoditiesMarket::transferVendorItemFromStockroom(CreatureObject &owner, N
 		else
 		{
 
-			DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction.\n"));
+			DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction."));
 
 			getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 		}
@@ -1756,7 +1756,7 @@ void CommoditiesMarket::auctionCreateImmediate(CreatureObject &owner, ServerObje
 		else
 		{
 
-			DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction.\n"));
+			DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction."));
 
 			getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 		}
@@ -1828,7 +1828,7 @@ void CommoditiesMarket::auctionCreatePermanent(const std::string &, const Server
 	else
 	{
 
-		DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction.\n"));
+		DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction."));
 		
 		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 	}
@@ -1892,7 +1892,7 @@ void CommoditiesMarket::auctionBid(CreatureObject &bidder, AuctionId auctionId,
 		else
 		{
 
-			DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send AddBid.\n"));
+			DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send AddBid."));
 
 			getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 		}
@@ -1931,7 +1931,7 @@ void CommoditiesMarket::auctionCancel(const NetworkId &playerId, AuctionId aucti
 	else
 	{
 
-		DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send CancelAuction.\n"));
+		DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send CancelAuction."));
 
 		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 	}
@@ -1956,7 +1956,7 @@ void CommoditiesMarket::auctionAccept(CreatureObject &who, AuctionId auctionId)
 	}
 	else
 	{
-		WARNING(true, ("[Commodities API] : No commodities server connection to send AcceptHighBid.\n"));
+		WARNING(true, ("[Commodities API] : No commodities server connection to send AcceptHighBid."));
 		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 	}
 */
@@ -2066,7 +2066,7 @@ void CommoditiesMarket::auctionQueryHeaders(
 			vendorId = zeroNetworkId;
 		else
 			vendorId = vendorObject->getNetworkId();
-		DEBUG_REPORT_LOG(true, ("  [AuctionQueryHeadersMessage]: container = %s, vendorId = %s\n", container.getValueString().c_str(), vendorId.getValueString().c_str()));
+		DEBUG_REPORT_LOG(true, ("  [AuctionQueryHeadersMessage]: container = %s, vendorId = %s", container.getValueString().c_str(), vendorId.getValueString().c_str()));
 
 		std::string searchStringPlanet;
 		std::string searchStringRegion;
@@ -2101,7 +2101,7 @@ void CommoditiesMarket::auctionQueryHeaders(
 	else
 	{
 
-		DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send QueryAuctionHeaders.\n"));
+		DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send QueryAuctionHeaders."));
 		
 		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 	}
@@ -2153,7 +2153,7 @@ void CommoditiesMarket::getAuctionDetails(CreatureObject &who, const NetworkId &
 	else
 	{
 
-		DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send GetItemDetails.\n"));
+		DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send GetItemDetails."));
 
 		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 	}
@@ -2170,7 +2170,7 @@ void CommoditiesMarket::getVendorValue(ServerObject &container)
 	}
 	else
 	{
-		DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send GetVendorValue.\n"));
+		DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send GetVendorValue."));
 		
 		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 	}
@@ -2189,7 +2189,7 @@ void CommoditiesMarket::createVendorMarket(const CreatureObject &who, ServerObje
 	}
 	else
 	{
-		DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send CreateVendorMarket.\n"));
+		DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send CreateVendorMarket."));
 
 		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 	}
@@ -2213,7 +2213,7 @@ void CommoditiesMarket::destroyVendorMarket(const NetworkId &playerId, ServerObj
 	else
 	{
 
-		DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send DestroyVendorMarket.\n"));
+		DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send DestroyVendorMarket."));
 
 		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 	}
@@ -2232,7 +2232,7 @@ void CommoditiesMarket::deleteAuctionLocation(const NetworkId& locationId, const
 	}
 	else
 	{
-		DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send DestroyVendorMarket.\n"));
+		DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send DestroyVendorMarket."));
 
 		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 	}
@@ -2254,7 +2254,7 @@ void CommoditiesMarket::isVendorOwner(CreatureObject &who, const NetworkId &cont
 		else
 		{
 
-			DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send GetVendorOwner.\n"));
+			DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send GetVendorOwner."));
 
 			onIsVendorOwner(who.getNetworkId(), zeroNetworkId, zeroNetworkId);
 			getCommoditiesServerConnection(); //attempt to reconnect to commodities server
@@ -2558,7 +2558,7 @@ void CommoditiesMarket::checkPendingLoads(const NetworkId &itemId)
 					}
 					else
 					{
-						DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send GetItem.\n"));
+						DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send GetItem."));
 				
 						getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 					}
@@ -2585,7 +2585,7 @@ void CommoditiesMarket::checkPendingLoads(const NetworkId &itemId)
 				}
 				else
 				{
-					DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send CleanupInvalidItemRetrieval.\n"));
+					DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send CleanupInvalidItemRetrieval."));
 					getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 				}
 
@@ -3007,7 +3007,7 @@ void CommoditiesMarket::onGetItemDetailsReply(int32 result, int32 requestId, Net
 					static const std::string attributeClientSharedTemplateName("ClientSharedTemplateName");
 					static const std::string attributeAppearanceData("AppearanceData");
 
-					DEBUG_REPORT_LOG(true,("Attribute:  %s, %s\n",i->first.c_str(),Unicode::wideToNarrow(i->second).c_str()));
+					DEBUG_REPORT_LOG(true,("Attribute:  %s, %s",i->first.c_str(),Unicode::wideToNarrow(i->second).c_str()));
 					
 					if (i->first==attributeClientSharedTemplateName)
 						details.templateName = Unicode::wideToNarrow(i->second);
@@ -3265,7 +3265,7 @@ void CommoditiesMarket::setSalesTax( int32 salesTax, const NetworkId &bankId, Se
 	}
 	else
 	{
-		WARNING(true, ("[Commodities API] : No commodities server connection to send SetSalesTax.\n"));
+		WARNING(true, ("[Commodities API] : No commodities server connection to send SetSalesTax."));
 		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 	}
 }
@@ -3399,12 +3399,12 @@ bool CommoditiesMarket::restoreItem(ServerObject& item, TangibleObject & vendor)
 		}
 		else
 		{
-			WARNING(true, ("[Commodities API] : Could not create Owner object in restore item.\n"));
+			WARNING(true, ("[Commodities API] : Could not create Owner object in restore item."));
 		}
 	}
 	else
 	{
-		DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction.\n"));
+		DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction."));
 
 		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 		
diff --git a/engine/shared/library/sharedFoundation/src/shared/Fatal.cpp b/engine/shared/library/sharedFoundation/src/shared/Fatal.cpp
index 37a3884f..c684c6e4 100755
--- a/engine/shared/library/sharedFoundation/src/shared/Fatal.cpp
+++ b/engine/shared/library/sharedFoundation/src/shared/Fatal.cpp
@@ -80,13 +80,13 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const
 		char file[4 * 1024] = { '\0' };
 		int line = 0;
 		if (ConfigSharedFoundation::getLookUpCallStackNames() && DebugHelp::lookupAddress(callStack[callStackOffset], lib, file, sizeof(file), line))
-			snprintf(buffer, bufferLength, "%s(%d) : %s %08x: ", file, line, type, static_cast<int>(Crc::calculate(format)));
+			snprintf(buffer, bufferLength, "%s(%d) : %s %08x: \n", file, line, type, static_cast<int>(Crc::calculate(format)));
 		else
-			snprintf(buffer, bufferLength, "unknown(0x%08X) : %s %08x: ", static_cast<int>(callStack[callStackOffset]), type, static_cast<int>(Crc::calculate(format)));
+			snprintf(buffer, bufferLength, "(0x%08X) : %s %08x: \n", static_cast<int>(callStack[callStackOffset]), type, static_cast<int>(Crc::calculate(format)));
 	}
 	else
 	{
-		snprintf(buffer, bufferLength, "unknown location : %s %08x: ", type, static_cast<int>(Crc::calculate(format)));
+		snprintf(buffer, bufferLength, "    (%08x): ", static_cast<int>(Crc::calculate(format)));
 	}
 
 	{
@@ -124,9 +124,9 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const
 				int line = 0;
 
 				if (ConfigSharedFoundation::getLookUpCallStackNames() && DebugHelp::lookupAddress(callStack[i], lib, file, sizeof(file), line))
-					snprintf(buffer, bufferLength, "  %s(%d) : caller %d\n", file, line, i-callStackOffset);
+					snprintf(buffer, bufferLength, "   %s(%d) : caller %d\n", file, line, i-callStackOffset);
 				else
-					snprintf(buffer, bufferLength, "  unknown(0x%08X) : caller %d\n", static_cast<int>(callStack[i]), i-callStackOffset);
+					snprintf(buffer, bufferLength, "   (0x%08X) : caller %d\n", static_cast<int>(callStack[i]), i-callStackOffset);
 
 				const int length = strlen(buffer);
 				buffer += length;
diff --git a/engine/shared/library/sharedFoundation/src/shared/Fatal.h b/engine/shared/library/sharedFoundation/src/shared/Fatal.h
index 14215b90..378992c6 100755
--- a/engine/shared/library/sharedFoundation/src/shared/Fatal.h
+++ b/engine/shared/library/sharedFoundation/src/shared/Fatal.h
@@ -33,22 +33,28 @@ void SetWarningCallback(WarningCallback);
 
 // ======================================================================
 
-#define FATAL(a, b) ((a) ? Fatal b : NOP)
 #ifdef _DEBUG
-	#define DEBUG_FATAL(a, b)   ((a) ? DebugFatal b : NOP)
+	#define LINEINFO(a) fprintf(stderr, "\n%s in %s() file %s:%d \n", a, __FUNCTION__, __FILE__ , __LINE__)
+#else
+	#define LINEINFO(a) fprintf(stderr, "%s: ", a)
+#endif
+
+#define FATAL(a, b) ((a) ? LINEINFO("FATAL"), Fatal b : NOP)
+#ifdef _DEBUG
+	#define DEBUG_FATAL(a, b)   ((a) ? LINEINFO("FATAL"), DebugFatal b : NOP)
 #else
 	#define DEBUG_FATAL(a, b)   NOP
 #endif
 
-#define WARNING(a, b) ((a) ? Warning b : NOP)
-#define WARNING_STACK_DEPTH(a, b) ((a) ? WarningStackDepth b : NOP)
+#define WARNING(a, b) ((a) ? LINEINFO("WARNING"), Warning b : NOP)
+#define WARNING_STACK_DEPTH(a, b) ((a) ? LINEINFO("WARNING"), WarningStackDepth b : NOP)
 #ifdef _DEBUG
 	#define DEBUG_WARNING(a, b)   WARNING(a, b)
 #else
 	#define DEBUG_WARNING(a, b)   NOP
 #endif
 
-#define CONSOLE_WARNING(a, b) ((a) ? ConsoleWarning b : NOP)
+#define CONSOLE_WARNING(a, b) ((a) ? LINEINFO("WARNING"), ConsoleWarning b : NOP)
 #ifdef _DEBUG
 	#define DEBUG_CONSOLE_WARNING(a, b)   CONSOLE_WARNING(a, b)
 #else
@@ -61,7 +67,7 @@ void SetWarningCallback(WarningCallback);
 	#define WARNING_DEBUG_FATAL(a, b)   WARNING(a, b)
 #endif
 
-#define WARNING_STRICT_FATAL(a, b) ((a) ? WarningStrictFatal b : NOP)
+#define WARNING_STRICT_FATAL(a, b) ((a) ? LINEINFO("FATAL"), WarningStrictFatal b : NOP)
 
 #ifdef _DEBUG