Index: /FCKeditor/branches/features/floating_dialog/_test/manual/fckdialog/test1.html
===================================================================
--- /FCKeditor/branches/features/floating_dialog/_test/manual/fckdialog/test1.html	(revision 1390)
+++ /FCKeditor/branches/features/floating_dialog/_test/manual/fckdialog/test1.html	(revision 1391)
@@ -79,5 +79,5 @@
 		for ( var i = 0 ; i < iframes.length ; i++ )
 		{
-			if ( iframes[i].src.search( 'fckdialog.html' ) != -1 )
+			if ( iframes[i].src.search( 'fckdialog.html' ) != -1 && iframes[i].contentWindow && iframes[i].contentWindow.CloseDialog )
 				iframes[i].contentWindow.CloseDialog() ;
 		}
Index: /FCKeditor/branches/features/floating_dialog/editor/fckdialog.html
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/fckdialog.html	(revision 1390)
+++ /FCKeditor/branches/features/floating_dialog/editor/fckdialog.html	(revision 1391)
@@ -686,5 +686,6 @@
 		// Points the src to a non-existent location to avoid loading errors later, in case the dialog
 		// haven't been completed loaded at this point.
-		$( 'frmMain' ).src = FCKTools.GetVoidUrl() ;
+		if ( $( 'frmMain' ) )
+			$( 'frmMain' ).src = FCKTools.GetVoidUrl() ;
 
 		if ( !dontFireChange && !FCK.EditMode )