Fixed issue when orElse in query is null

Author: JanHolger

src/main/java/org/javawebstack/abstractdata/AbstractObject.java

@@ -103,6 +103,8 @@ public AbstractElement query(String query) {
     }
 
     public AbstractElement query(String query, AbstractElement orElse) {
+        if(orElse == null)
+            orElse = AbstractNull.VALUE;
         AbstractElement value = query(query);
         return (value != null && !value.isNull()) ? value : orElse;
     }
@@ -168,23 +170,23 @@ public String string(String key) throws AbstractCoercingException {
     }
 
     public String string(String key, String orElse) throws AbstractCoercingException {
-        return query(key, new AbstractPrimitive(orElse)).string();
+        return query(key, orElse == null ? AbstractNull.VALUE : new AbstractPrimitive(orElse)).string();
     }
 
     public Boolean bool(String key) throws AbstractCoercingException {
         return query(key, AbstractNull.VALUE).bool();
     }
 
     public Boolean bool(String key, Boolean orElse) throws AbstractCoercingException {
-        return query(key, new AbstractPrimitive(orElse)).bool();
+        return query(key, orElse == null ? AbstractNull.VALUE : new AbstractPrimitive(orElse)).bool();
     }
 
     public Number number(String key) throws AbstractCoercingException {
         return query(key, AbstractNull.VALUE).number();
     }
 
     public Number number(String key, Number orElse) throws AbstractCoercingException {
-        return query(key, new AbstractPrimitive(orElse)).number();
+        return query(key, orElse == null ? AbstractNull.VALUE : new AbstractPrimitive(orElse)).number();
     }
 
     public Object toObject() {