From 8455588e2e935426e379e9eff3a6c00b04dd5fee Mon Sep 17 00:00:00 2001
From: airsquared <36649395+airsquared@users.noreply.github.com>
Date: Fri, 29 Mar 2019 19:08:39 -0700
Subject: [PATCH] Fix "Could not find: 'null'" error

---
 src/main/java/com/airsquared/blobsaver/Controller.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/airsquared/blobsaver/Controller.java b/src/main/java/com/airsquared/blobsaver/Controller.java
index ed73a796..d0dd1928 100644
--- a/src/main/java/com/airsquared/blobsaver/Controller.java
+++ b/src/main/java/com/airsquared/blobsaver/Controller.java
@@ -915,11 +915,11 @@ public void readInfo() {
     @SuppressWarnings("Duplicates")
     public void goButtonHandler() {
         boolean doReturn = false;
-        if (!identifierCheckBox.isSelected() && "".equals(deviceTypeChoiceBox.getValue())) {
+        if (!identifierCheckBox.isSelected() && (deviceTypeChoiceBox.getValue() == null || "".equals(deviceTypeChoiceBox.getValue()))) {
             deviceTypeChoiceBox.setEffect(errorBorder);
             doReturn = true;
         }
-        if (!identifierCheckBox.isSelected() && "".equals(deviceModelChoiceBox.getValue())) {
+        if (!identifierCheckBox.isSelected() && ("".equals(deviceModelChoiceBox.getValue()))) {
             deviceModelChoiceBox.setEffect(errorBorder);
             doReturn = true;
         }
@@ -957,7 +957,7 @@ private static boolean isTextFieldInvalid(CheckBox checkBox, TextField textField
     }
 
     private static boolean isTextFieldInvalid(boolean isTextFieldRequired, TextField textField) {
-        if (isTextFieldRequired && "".equals(textField.getText())) {
+        if (isTextFieldRequired && (textField.getText() == null || "".equals(textField.getText()))) {
             textField.setEffect(errorBorder);
             return true;
         }