diff --git a/components/発車時刻表/LED_vidion.js b/components/発車時刻表/LED_vidion.js
index 17fc581..4458f22 100644
--- a/components/発車時刻表/LED_vidion.js
+++ b/components/発車時刻表/LED_vidion.js
@@ -124,10 +124,11 @@ export default function LED_vision(props) {
     const returnData = Object.keys(stationDiagram).map((d) => {
       let a = {};
       stationDiagram[d].split("#").forEach((data) => {
+        console.log(data);
         if (data.match("着")) {
           a.lastStation = data.split(",着,")[0];
         }
-        if (data.match(station.Station_JP)) {
+        if (data.split(",")[0] === station.Station_JP) {
           if (data.match(",発,")) {
             a.time = data.split(",発,")[1];
           } else {
@@ -451,6 +452,7 @@ const StatusAndDelay = ({ currentTrain, d, props, trainDescriptionSwitch }) => {
   const [status, setStatus] = useState("");
   useEffect(() => {
     const current = currentTrain.filter((a) => a.num == d.train)[0];
+    if (!current) return () => {};
     const delay = current.delay;
     switch (true) {
       case delay === "入線":