--- a/elrail.c	Fri Mar 31 18:36:13 2006 +0000
+++ b/elrail.c	Fri Mar 31 19:01:57 2006 +0000
@@ -101,9 +101,11 @@
 				}
 			}
 		case MP_STREET:
+			if (!GetRoadType(t) == ROAD_CROSSING) return 0;
 			if (GetRailTypeCrossing(t) != RAILTYPE_ELECTRIC) return 0;
 			return GetCrossingRailBits(t);
 		case MP_STATION:
+			if (!IsRailwayStation(t)) return 0;
 			if (GetRailType(t) != RAILTYPE_ELECTRIC) return 0;
 			return TrackToTrackBits(GetRailStationTrack(t));
 		default: