diff --git a/Server/src/main/java/org/gluu/oxauth/authorize/ws/rs/ConsentGathererService.java b/Server/src/main/java/org/gluu/oxauth/authorize/ws/rs/ConsentGathererService.java
index 651086edf3..deb48d4187 100644
--- a/Server/src/main/java/org/gluu/oxauth/authorize/ws/rs/ConsentGathererService.java
+++ b/Server/src/main/java/org/gluu/oxauth/authorize/ws/rs/ConsentGathererService.java
@@ -304,7 +304,11 @@ public ConsentGatheringContext getContext() {
 		return context;
 	}
 
-    public List<org.oxauth.persistence.model.Scope> getScopes(ConsentGatheringContext context) {
+    public List<org.oxauth.persistence.model.Scope> getScopes() {
+    	if (context == null) {
+    		return Collections.emptyList();
+    	}
+
     	SessionId authenticatedSessionId = sessionIdService.getSessionId();
         // Fix the list of scopes in the authorization page. oxAuth #739
         Set<String> grantedScopes = scopeChecker.checkScopesPolicy(context.getClient(), authenticatedSessionId.getSessionAttributes().get(AuthorizeRequestParam.SCOPE));
diff --git a/Server/src/main/webapp/authz/authorize.xhtml b/Server/src/main/webapp/authz/authorize.xhtml
index b1bf6cf84d..27555af2eb 100644
--- a/Server/src/main/webapp/authz/authorize.xhtml
+++ b/Server/src/main/webapp/authz/authorize.xhtml
@@ -11,7 +11,7 @@
 	</f:metadata>
 
 	<ui:param name="_client" value="#{consentGatherer.context.client}" />
-	<ui:param name="_scopes" value="#{consentGatherer.getScopes(consentGatherer.context)}" />
+	<ui:param name="_scopes" value="#{consentGatherer.scopes)}" />
 
     <ui:define name="controlButttons">
     	<h:commandLink id="doNotAllowButton" class="button button-default"