diff --git a/macros.h b/macros.h
index 227da3871a..bd5604419b 100644
--- a/macros.h
+++ b/macros.h
@@ -87,7 +87,7 @@ extern uint SafeTileAdd(uint x, int add, const char *exp, const char *file, int
 #	define TILE_ADD(x,y) ((x)+(y))
 #else
 #	if defined(__GNUC__)
-#		define TILE_ADD(x,y) (SafeTileAdd((x),(y), "??",  __FILE__, __LINE__))
+#		define TILE_ADD(x,y) (SafeTileAdd((x),(y), #x ", " #y,  __FILE__, __LINE__))
 #	else
 #		define TILE_ADD(x,y) (SafeTileAdd((x),(y), #x ## ", " ## #y,  __FILE__, __LINE__))
 #	endif
diff --git a/misc.c b/misc.c
index 7a7b41d514..c37122df79 100644
--- a/misc.c
+++ b/misc.c
@@ -740,7 +740,7 @@ extern uint SafeTileAdd(uint tile, int add, const char *exp, const char *file, i
 
 		sprintf(buf, "TILE_ADD(%s) when adding 0x%.4X and %d failed", exp, tile, add);
 #if !defined(_DEBUG) || !defined(_MSC_VER)
-		printf("%s\n", buf);
+		fprintf(stderr, "%s:%d %s\n", file, line, buf);
 #else
 		_assert(buf, (char*)file, line);
 #endif