diff --git a/apps/openmw/mwgui/text_input.cpp b/apps/openmw/mwgui/text_input.cpp
index 9d5ba9896..3dbe75165 100644
--- a/apps/openmw/mwgui/text_input.cpp
+++ b/apps/openmw/mwgui/text_input.cpp
@@ -47,10 +47,22 @@ void TextInputDialog::open()
 
 void TextInputDialog::onOkClicked(MyGUI::Widget* _sender)
 {
-    eventDone(this);
+    if (mTextEdit->getCaption() == "")
+    {
+        mWindowManager.messageBox ("#{sNotifyMessage37}", std::vector<std::string>());
+        MyGUI::InputManager::getInstance ().setKeyFocusWidget (mTextEdit);
+    }
+    else
+        eventDone(this);
 }
 
 void TextInputDialog::onTextAccepted(MyGUI::Edit* _sender)
 {
-    eventDone(this);
+    if (mTextEdit->getCaption() == "")
+    {
+        mWindowManager.messageBox ("#{sNotifyMessage37}", std::vector<std::string>());
+        MyGUI::InputManager::getInstance ().setKeyFocusWidget (mTextEdit);
+    }
+    else
+        eventDone(this);
 }
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 01c5d594a..c8852bff5 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -72,6 +72,8 @@ namespace MWRender
     CharacterPreview::~CharacterPreview ()
     {
         Ogre::TextureManager::getSingleton().remove(mName);
+        mSceneMgr->destroyCamera (mName);
+        delete mAnimation;
     }