From c305304165c7fa670f2f231b4618986fd2666a06 Mon Sep 17 00:00:00 2001
From: Bruno Medeiros <bruno.do.medeiros@gmail.com>
Date: Mon, 8 Feb 2016 12:47:05 +0000
Subject: [PATCH] Fix possible regression

---
 .../lang/ide/core/engine/SourceModelManager.java      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugin_ide.core/src-lang/melnorme/lang/ide/core/engine/SourceModelManager.java b/plugin_ide.core/src-lang/melnorme/lang/ide/core/engine/SourceModelManager.java
index 156f9916a..91e888221 100644
--- a/plugin_ide.core/src-lang/melnorme/lang/ide/core/engine/SourceModelManager.java
+++ b/plugin_ide.core/src-lang/melnorme/lang/ide/core/engine/SourceModelManager.java
@@ -372,12 +372,15 @@ public static <R> R runUnderDocumentLock(IDocument doc, CallableX<R, RuntimeExce
 		if(doc instanceof ISynchronizable) {
 			ISynchronizable synchronizable = (ISynchronizable) doc;
 			
-			synchronized(synchronizable.getLockObject()) {
-				return runnable.call();
+			Object lockObject = synchronizable.getLockObject();
+			if(lockObject != null) {
+				synchronized(lockObject) {
+					return runnable.call();
+				}
 			}
-		} else {
-			return runnable.call();
 		}
+		
+		return runnable.call();
 	}
 	
 }
\ No newline at end of file