--- a/Tools__TextDiff3Tool.st	Fri Mar 16 20:24:01 2012 +0000
+++ b/Tools__TextDiff3Tool.st	Fri Mar 16 22:44:50 2012 +0000
@@ -227,15 +227,17 @@
 updateViews
 
     self mergeHolder value ifTrue:[
-        contentSpecHolder value: #mergeSpec
+        self contentSpecHolder value: #mergeSpec
     ] ifFalse:[
-        contentSpecHolder value: #diff3Spec
+        self contentSpecHolder value: #diff3Spec
     ].
 
-    diffView
-        text1: self textCHolder value
-        text2: self textAHolder value
-        text3: self textBHolder value
+    diffView notNil ifTrue:[
+        diffView
+            text1: self textCHolder value
+            text2: self textAHolder value
+            text3: self textBHolder value
+    ]
 
     "Created: / 16-03-2012 / 13:24:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
@@ -275,5 +277,5 @@
 !TextDiff3Tool class methodsFor:'documentation'!
 
 version_SVN
-    ^ '$Id: Tools__TextDiff3Tool.st 7925 2012-03-16 17:08:17Z vranyj1 $'
+    ^ '$Id: Tools__TextDiff3Tool.st 7936 2012-03-16 22:44:50Z vranyj1 $'
 ! !