Index: /CKEditor.NET/trunk/CHANGES.html
===================================================================
--- /CKEditor.NET/trunk/CHANGES.html	(revision 6688)
+++ /CKEditor.NET/trunk/CHANGES.html	(revision 6689)
@@ -72,5 +72,6 @@
 		<li><a href="http://dev.ckeditor.com/ticket/7283">#7283</a> : Entered text is not HTML encoded.</li>
 		<li><a href="http://dev.ckeditor.com/ticket/7302">#7302</a> : It was impossible to customise the editor inside masterpage and if attributes were placed in front of the Control ID.</li>
-		<li><a href="http://dev.ckeditor.com/ticket/7590">#7590</a> : Error when trying to reset values in the Properties window.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7590">#7590</a> : Error in Visual Studio when trying to reset values in the Properties window.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7292">#7292</a> : Error: &quot;e is null&quot; when CKEditor is running inside of MultiView control.</li>
 	</ul>
 	<h2>
Index: /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs
===================================================================
--- /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs	(revision 6688)
+++ /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs	(revision 6689)
@@ -991,5 +991,5 @@
 			// http://msdn.microsoft.com/en-us/library/bb386417.aspx
 			// Check _dev/msajax.js for an uncompressed version (available in CKEditor.Net downloaded from SVN).
-			scriptInit += @"var CKEditor_Controls=[],CKEditor_Init=[];function CKEditor_TextBoxEncode(d,e){if(typeof CKEDITOR=='undefined'||typeof CKEDITOR.instances[d]=='undefined'){var f=document.getElementById(d);f.value=f.value.replace(/</g,'&lt;').replace(/>/g,'&gt;');}else{var g=CKEDITOR.instances[d];if(e)g.destroy();else g.updateElement();}};(function(){var d=function(){var e=CKEditor_Controls,f=CKEditor_Init,g=window.pageLoad,h=function(){for(var i=e.length;i--;){var j=document.getElementById(e[i]);if(j&&j.value&&(j.value.indexOf('<')==-1||j.value.indexOf('>')==-1))j.value=j.value.replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&amp;/g,'&');}if(typeof CKEDITOR!='undefined')for(var i=0;i<f.length;i++)f[i].call(this);};window.pageLoad=function(i,j){if(j.get_isPartialLoad())setTimeout(h,0);if(g&&typeof g=='function')g.call(this,i,j);};setTimeout(h,0);};if(window.addEventListener)window.addEventListener('load',d,false);else if(window.attachEvent)window.attachEvent('onload',d);})();
+			scriptInit += @"var CKEditor_Controls=[],CKEditor_Init=[];function CKEditor_TextBoxEncode(d,e){if(typeof CKEDITOR=='undefined'||typeof CKEDITOR.instances[d]=='undefined'){var f=document.getElementById(d); if(f) f.value=f.value.replace(/</g,'&lt;').replace(/>/g,'&gt;');}else{var g=CKEDITOR.instances[d];if(e)g.destroy();else g.updateElement();}};(function(){var d=function(){var e=CKEditor_Controls,f=CKEditor_Init,g=window.pageLoad,h=function(){for(var i=e.length;i--;){var j=document.getElementById(e[i]);if(j&&j.value&&(j.value.indexOf('<')==-1||j.value.indexOf('>')==-1))j.value=j.value.replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&amp;/g,'&');}if(typeof CKEDITOR!='undefined')for(var i=0;i<f.length;i++)f[i].call(this);};window.pageLoad=function(i,j){if(j.get_isPartialLoad())setTimeout(h,0);if(g&&typeof g=='function')g.call(this,i,j);};setTimeout(h,0);};if(window.addEventListener)window.addEventListener('load',d,false);else if(window.attachEvent)window.attachEvent('onload',d);})();
 ";
 			this.RegisterStartupScript(this.GetType(), "CKEditorForNet", scriptInit, true);
@@ -1009,9 +1009,9 @@
 					proSour += @"
 ckeditor.config.protectedSource.push( " + item + " );";
-				script += string.Format(@"CKEditor_Init.push(function(){{if(typeof CKEDITOR.instances['{0}']!='undefined') return;var ckeditor = CKEDITOR.replace('{0}',{1}); {2}}});
+				script += string.Format(@"CKEditor_Init.push(function(){{if(typeof CKEDITOR.instances['{0}']!='undefined' || !document.getElementById('{0}')) return;var ckeditor = CKEDITOR.replace('{0}',{1}); {2}}});
 ", this.ClientID, prepareJSON(), proSour);
 			}
 			else
-				script += string.Format(@"CKEditor_Init.push(function(){{if(typeof CKEDITOR.instances['{0}']!='undefined') return;CKEDITOR.replace('{0}',{1});}});
+				script += string.Format(@"CKEditor_Init.push(function(){{if(typeof CKEDITOR.instances['{0}']!='undefined' || !document.getElementById('{0}')) return;CKEDITOR.replace('{0}',{1});}});
 ", this.ClientID, prepareJSON());
 
Index: /CKEditor.NET/trunk/_dev/msajax.js
===================================================================
--- /CKEditor.NET/trunk/_dev/msajax.js	(revision 6688)
+++ /CKEditor.NET/trunk/_dev/msajax.js	(revision 6689)
@@ -11,5 +11,6 @@
 	if (typeof CKEDITOR == 'undefined' || typeof CKEDITOR.instances[cID] == 'undefined') {
 		var control = document.getElementById(cID);
-		control.value = control.value.replace(/</g, '&lt;').replace(/>/g, '&gt;');
+		if (control)
+			control.value = control.value.replace(/</g, '&lt;').replace(/>/g, '&gt;');
 	} 
 	else {