diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp
index c22cb006..c494ac90 100644
--- a/Contrib/InstallOptions/InstallerOptions.cpp
+++ b/Contrib/InstallOptions/InstallerOptions.cpp
@@ -663,6 +663,8 @@ LRESULT WMCommandProc(HWND hWnd, UINT id, HWND hwndCtl, UINT codeNotify) {
 		case BN_CLICKED:
       {
         int nIdx = FindControlIdx(id);
+        if (nIdx < 0)
+          break;
         if (pFields[nIdx].nType == FIELD_BROWSEBUTTON) {
           int nParentIdx = pFields[nIdx].nParentIdx;
           switch(pFields[nParentIdx].nType) {
@@ -726,7 +728,10 @@ BOOL CALLBACK cfgDlgProc(HWND   hwndDlg,
         HFONT OldFont;
         LOGFONT lf;
 #endif
-        
+
+        if (nIdx < 0)
+          break;
+
 #ifdef IO_LINK_UNDERLINED
         GetObject(GetCurrentObject(lpdis->hDC, OBJ_FONT), sizeof(lf), &lf);
         lf.lfUnderline = TRUE;
@@ -789,6 +794,9 @@ BOOL CALLBACK cfgDlgProc(HWND   hwndDlg,
 int WINAPI StaticLINKWindowProc(HWND hWin, UINT uMsg, LPARAM wParam, WPARAM lParam)
 {
   int StaticField = FindControlIdx(GetDlgCtrlID(hWin));
+  if (StaticField < 0)
+    return 0;
+
   switch(uMsg)
   {
   case WM_GETDLGCODE:
diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll
index 5b0f6cb6..f9f9411a 100644
Binary files a/Plugins/InstallOptions.dll and b/Plugins/InstallOptions.dll differ