From eb4667bc4553bf72f9f4fc8acd683eebcf5c9c48 Mon Sep 17 00:00:00 2001
From: iMoHax <born19th@gmail.com>
Date: Fri, 16 Oct 2015 11:55:06 +0300
Subject: [PATCH] fix null pointer exception

---
 .../java/ru/trader/controllers/OffersController.java     | 2 +-
 .../ru/trader/controllers/RouteSearchController.java     | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/client/src/main/java/ru/trader/controllers/OffersController.java b/client/src/main/java/ru/trader/controllers/OffersController.java
index 4a36f80..e7b6c2f 100644
--- a/client/src/main/java/ru/trader/controllers/OffersController.java
+++ b/client/src/main/java/ru/trader/controllers/OffersController.java
@@ -236,7 +236,7 @@ public class OffersController {
         @Override
         public void priceChange(OfferModel offer, double oldPrice, double newPrice) {
             StationModel station = getStation();
-            if (station.hasBuy(offer.getItem()) || station.hasSell(offer.getItem())){
+            if (station != null && (station.hasBuy(offer.getItem()) || station.hasSell(offer.getItem()))){
                 ViewUtils.doFX(OffersController.this::sort);
             }
         }
diff --git a/client/src/main/java/ru/trader/controllers/RouteSearchController.java b/client/src/main/java/ru/trader/controllers/RouteSearchController.java
index 1e3f8c9..92e20ab 100644
--- a/client/src/main/java/ru/trader/controllers/RouteSearchController.java
+++ b/client/src/main/java/ru/trader/controllers/RouteSearchController.java
@@ -67,7 +67,14 @@ public class RouteSearchController {
             fromStation.setItems(n.getStationNamesList());
             fromStation.getSelectionModel().selectFirst();
         });
-        fromStation.valueProperty().addListener((ov, o , n) -> missionsController.setStation(fromSystem.getValue().get(n)));
+        fromStation.valueProperty().addListener((ov, o , n) -> {
+            SystemModel system = fromSystem.getValue();
+            if (system == null || n == null){
+                missionsController.setStation(ModelFabric.NONE_STATION);
+            } else {
+                missionsController.setStation(system.get(n));
+            }
+        });
         toSystem.valueProperty().addListener((ov, o , n) -> {
             toStation.setItems(n.getStationNamesList());
             toStation.getSelectionModel().selectFirst();