--- a/src/hugin1/hugin/PreferencesDialog.cpp
+++ b/src/hugin1/hugin/PreferencesDialog.cpp
@@ -227,13 +227,32 @@
     DEBUG_TRACE("end dtor");
 }
 
+
+void PreferencesDialog::VerifyEntryData() {
+    // Check that valid information is in the entry fields
+    wxString buffer;
+    buffer = XRCCTRL(*this, "prefs_enblend_EnblendExe", wxTextCtrl)->GetValue();
+    if (buffer == wxEmptyString) {
+        DEBUG_WARN("Enblend executable field empty, defaulting to false");
+        XRCCTRL(*this, "prefs_enblend_EnblendExe", wxTextCtrl)->SetValue(wxT("false"));
+    }
+    buffer = XRCCTRL(*this, "prefs_enblend_EnfuseExe", wxTextCtrl)->GetValue();
+    if (buffer == wxEmptyString) {
+        DEBUG_WARN("Enfuse executable field empty, defaulting to false");
+        XRCCTRL(*this, "prefs_enblend_EnfuseExe", wxTextCtrl)->SetValue(wxT("false"));
+    }
+}
+
+
 void PreferencesDialog::OnApply(wxCommandEvent & e)
 {
+    VerifyEntryData();
     UpdateConfigData();
 }
 
 void PreferencesDialog::OnOk(wxCommandEvent & e)
 {
+    VerifyEntryData();
     UpdateConfigData();
     this->EndModal(wxOK);
 }