From e1e29be314f15e26d6a70ab2f0f2ec55d3736a42 Mon Sep 17 00:00:00 2001
From: paulevsGitch <paulevs@yandex.ru>
Date: Sun, 6 Dec 2020 21:14:18 +0300
Subject: [PATCH] Fixed issue #29

---
 src/main/java/ru/betterend/util/JsonFactory.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/ru/betterend/util/JsonFactory.java b/src/main/java/ru/betterend/util/JsonFactory.java
index 56b01130..1b51e1c2 100644
--- a/src/main/java/ru/betterend/util/JsonFactory.java
+++ b/src/main/java/ru/betterend/util/JsonFactory.java
@@ -65,11 +65,14 @@ public class JsonFactory {
 	
 	public static JsonObject getJsonObject(File jsonFile) {
 		if (jsonFile.exists()) {
-			JsonObject jsonObject = loadJson(jsonFile).getAsJsonObject();
-			if (jsonObject == null) {
-				return new JsonObject();
+			JsonElement json = loadJson(jsonFile);
+			if (json != null && json.isJsonObject()) {
+				JsonObject jsonObject = json.getAsJsonObject();
+				if (jsonObject == null) {
+					return new JsonObject();
+				}
+				return jsonObject;
 			}
-			return jsonObject;
 		}
 		
 		return new JsonObject();