diff --git a/org.cloudfoundry.ide.eclipse.server.core/src/org/cloudfoundry/ide/eclipse/server/core/internal/CloudErrorUtil.java b/org.cloudfoundry.ide.eclipse.server.core/src/org/cloudfoundry/ide/eclipse/server/core/internal/CloudErrorUtil.java
index 5d4e58be..d1c5c4c3 100644
--- a/org.cloudfoundry.ide.eclipse.server.core/src/org/cloudfoundry/ide/eclipse/server/core/internal/CloudErrorUtil.java
+++ b/org.cloudfoundry.ide.eclipse.server.core/src/org/cloudfoundry/ide/eclipse/server/core/internal/CloudErrorUtil.java
@@ -148,7 +148,7 @@ else if (isForbiddenException(error)) {
 			else if (error.getCause() instanceof OAuth2AccessDeniedException) {
 				oauthException = (OAuth2AccessDeniedException) error.getCause();
 			}
-			if (oauthException != null && oauthException.getHttpErrorCode() == 403) {
+			if (oauthException != null) {
 				return NLS.bind(Messages.ERROR_ACCESS_TOKEN, oauthException.getOAuth2ErrorCode());
 			}
 		}
diff --git a/org.cloudfoundry.ide.eclipse.server.core/src/org/cloudfoundry/ide/eclipse/server/core/internal/client/LocalServerRequest.java b/org.cloudfoundry.ide.eclipse.server.core/src/org/cloudfoundry/ide/eclipse/server/core/internal/client/LocalServerRequest.java
index d97b6ad5..6c9d5540 100644
--- a/org.cloudfoundry.ide.eclipse.server.core/src/org/cloudfoundry/ide/eclipse/server/core/internal/client/LocalServerRequest.java
+++ b/org.cloudfoundry.ide.eclipse.server.core/src/org/cloudfoundry/ide/eclipse/server/core/internal/client/LocalServerRequest.java
@@ -61,7 +61,7 @@ protected String getTokenAccessErrorLabel() {
 				}
 			}
 			catch (Throwable e) {
-				// Don't log as the label may be called multiple times. If the
+				// Don't log. If the
 				// server failed to resolve, the request itself
 				// will fail and will log the error accordingly
 			}