diff --git a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/AuthorizationRequestImpl.java b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/AuthorizationRequestImpl.java
index 03b2a2d3c..4141afcd1 100644
--- a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/AuthorizationRequestImpl.java
+++ b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/AuthorizationRequestImpl.java
@@ -33,7 +33,7 @@ public class AuthorizationRequestImpl implements AuthorizationRequest {
 
 	private JsonObject token;
 	private String clientId;
-	private Set<String> scopes = null;
+	private Set<String> scopes = new HashSet<String>();
 
 	public AuthorizationRequestImpl(JsonObject token) {
 		this.token = token;
diff --git a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/OAuth2AccessTokenImpl.java b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/OAuth2AccessTokenImpl.java
index e1b0a644a..01bc3f1ce 100644
--- a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/OAuth2AccessTokenImpl.java
+++ b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/OAuth2AccessTokenImpl.java
@@ -30,6 +30,8 @@ import java.util.logging.Logger;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 import org.springframework.security.oauth2.common.OAuth2RefreshToken;
 
+import com.google.common.base.Splitter;
+import com.google.common.collect.Sets;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
@@ -38,16 +40,15 @@ public class OAuth2AccessTokenImpl implements OAuth2AccessToken {
 
 	private JsonObject token;
 	private String tokenString;
-	private Set<String> scopes = null;
+	private Set<String> scopes = new HashSet<String>();
 	private Date expireDate;
 
 
 	public OAuth2AccessTokenImpl(JsonObject token, String tokenString) {
 		this.token = token;
 		this.tokenString = tokenString;
-		scopes = new HashSet<String>();
-		for (JsonElement e : token.get("scope").getAsJsonArray()) {
-			scopes.add(e.getAsString());
+		if (token.get("scope") != null) {
+			scopes = Sets.newHashSet(Splitter.on(" ").split(token.get("scope").getAsString()));
 		}
 
 		DateFormat dateFormater = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");