diff --git a/org.eclipse.lsp4xml/src/main/java/org/eclipse/lsp4xml/settings/capabilities/ClientCapabilitiesWrapper.java b/org.eclipse.lsp4xml/src/main/java/org/eclipse/lsp4xml/settings/capabilities/ClientCapabilitiesWrapper.java
index ba719bd2d..ae4620027 100644
--- a/org.eclipse.lsp4xml/src/main/java/org/eclipse/lsp4xml/settings/capabilities/ClientCapabilitiesWrapper.java
+++ b/org.eclipse.lsp4xml/src/main/java/org/eclipse/lsp4xml/settings/capabilities/ClientCapabilitiesWrapper.java
@@ -27,6 +27,7 @@ public ClientCapabilitiesWrapper() {
 		this.capabilities = new ClientCapabilities();
 		this.v3Supported = false;
 	}
+
 	public ClientCapabilitiesWrapper(ClientCapabilities capabilities) {
 		this.capabilities = capabilities;
 		this.v3Supported = capabilities != null ? capabilities.getTextDocument() != null : false;
@@ -84,7 +85,8 @@ public boolean isDocumentHighlightDynamicRegistered() {
 	}
 
 	private boolean isDynamicRegistrationSupported(DynamicRegistrationCapabilities capability) {
-		return capability != null && capability.getDynamicRegistration().booleanValue();
+		return capability != null && capability.getDynamicRegistration() != null
+				&& capability.getDynamicRegistration().booleanValue();
 	}
 
 	public TextDocumentClientCapabilities getTextDocument() {