diff --git a/xendit-java-lib/src/main/java/com/xendit/exception/XenditException.java b/xendit-java-lib/src/main/java/com/xendit/exception/XenditException.java
index c81538d..c83b0db 100644
--- a/xendit-java-lib/src/main/java/com/xendit/exception/XenditException.java
+++ b/xendit-java-lib/src/main/java/com/xendit/exception/XenditException.java
@@ -1,5 +1,6 @@
 package com.xendit.exception;
 
+import java.util.Collections;
 import java.util.Map;
 
 public class XenditException extends Exception {
@@ -13,7 +14,7 @@ public XenditException(String message) {
   public XenditException(String message, String code, Map<String, Object> context) {
     super(message);
     this.code = code;
-    this.context = context;
+    this.context = context != null ? context : Collections.emptyMap();
   }
 
   public String getErrorCode() {