diff --git a/e107_plugins/tinymce/e_meta.php b/e107_plugins/tinymce/e_meta.php
index 44f2f0e93..7da9e549b 100644
--- a/e107_plugins/tinymce/e_meta.php
+++ b/e107_plugins/tinymce/e_meta.php
@@ -130,6 +130,12 @@ if((e_WYSIWYG && check_class($pref['post_html'])) || strpos(e_SELF,"tinymce/admi
 			$('.e-dialog-save').click(function(){
 				
 				var html = $('#html_holder').val();	
+				
+				if(html === undefined)
+				{
+					return;
+				}
+				
 			//	tinyMCE.execCommand('mceInsertContent',false,html);
 				tinyMCE.execCommand('mceInsertRawHTML',false,html);
 				tinyMCEPopup.close();
diff --git a/e107_web/js/core/mediaManager.js b/e107_web/js/core/mediaManager.js
index 99104ea73..8ecbd146b 100644
--- a/e107_web/js/core/mediaManager.js
+++ b/e107_web/js/core/mediaManager.js
@@ -3,10 +3,11 @@ $(document).ready(function()
 	
 	$(".e-dialog-save").live("click", function(){// FIXME TODO missing caret , text selection overwrite etc. 
 					
-		var newval = $('#bbcode_holder').val();
+		var newval 	= $('#bbcode_holder').val();
 		var target 	= $(this).attr('data-target');
+		var bbcode	= $(this).attr('data-bbcode'); // TinyMce/Textarea insert mode
 				
-		if(!target){ return true; }
+		if(!target || !bbcode){ return true; }
 		
 		$('#' + target, window.top.document).atCaret('insert', newval); // http://code.google.com/p/jquery-at-caret/wiki/GettingStarted
 		
@@ -169,6 +170,8 @@ $(document).ready(function()
 				}
 				
 				
+
+
 				$('#src').attr('value',src); // working old
 				$('#preview').attr('src',preview);	// working old