diff --git a/src/main/java/com/safeqr/app/qrcode/entity/URLEntity.java b/src/main/java/com/safeqr/app/qrcode/entity/URLEntity.java
index 42b11ec..370bf7a 100644
--- a/src/main/java/com/safeqr/app/qrcode/entity/URLEntity.java
+++ b/src/main/java/com/safeqr/app/qrcode/entity/URLEntity.java
@@ -105,13 +105,13 @@ public class URLEntity {
     // Custom getter for path
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public String getPath() {
-        return path.isEmpty() ? null : path;
+        return path == null || path.isEmpty() ? null : path;
     }
 
     // Custom getter for query
     @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty
     public String getQuery() {
-        return query.equals("{}") ? null : query;
+        return query == null || query.equals("{}") ? null : query;
     }
 }