diff --git a/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java
index b1f83efe1..67b6d3370 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java
@@ -116,7 +116,9 @@ public class OAuth2AccessTokenEntity implements OAuth2AccessToken {
 	@Transient
 	public Map<String, Object> getAdditionalInformation() {
 		Map<String, Object> map = new HashMap<String, Object>(); //super.getAdditionalInformation();
-		map.put(ID_TOKEN, getIdTokenString());
+		if (getIdToken() != null) {
+			map.put(ID_TOKEN, getIdTokenString());
+		}
 		return map;
 	}