diff --git a/src/main/java/graphql/relay/Relay.java b/src/main/java/graphql/relay/Relay.java
index c69673404e..54f4dacc5c 100644
--- a/src/main/java/graphql/relay/Relay.java
+++ b/src/main/java/graphql/relay/Relay.java
@@ -212,6 +212,9 @@ public String toGlobalId(String type, String id) {
 
     public ResolvedGlobalId fromGlobalId(String globalId) {
         String[] split = Base64.fromBase64(globalId).split(":", 2);
+        if (split.length != 2) {
+            throw new IllegalArgumentException(String.format("expecting a valid global id, got %s", globalId));
+        }
         return new ResolvedGlobalId(split[0], split[1]);
     }
 }