diff --git a/installer/installer/AMXInstaller.exe b/installer/installer/AMXInstaller.exe
index 1f5ee858..77860d04 100755
Binary files a/installer/installer/AMXInstaller.exe and b/installer/installer/AMXInstaller.exe differ
diff --git a/installer/installer/UnitInstall.pas b/installer/installer/UnitInstall.pas
index ad0ef0dd..fc9e2e7e 100755
--- a/installer/installer/UnitInstall.pas
+++ b/installer/installer/UnitInstall.pas
@@ -38,7 +38,7 @@ uses UnitfrmMain, UnitfrmProxy, UnitFunctions, UnitScanMods;
 
 function InstallTime: String;
 begin
-  Result := FormatDateTime('HH:MM:SS', Now - StartTime);
+  Result := Copy(FormatDateTime('HH:MM:SS', Now - StartTime), 4, 5);
 end;
 
 procedure AddStatus(Text: String; Color: TColor; ShowTime: Boolean = True);
@@ -309,6 +309,18 @@ begin
   AddDone('found ' + IntToStr(FileList.Count) + ' files..');
   AddStatus('', clBlack, False);
 
+  if (DirList.Count = 0) or (FileList.Count = 0) then begin
+    MessageBox(frmMain.Handle, 'Sorry, you do not seem to have any files in your files-directory. Please verify that you have properly installed the full AMX Mod X package and try again.', 'Error', MB_ICONERROR);
+
+    Screen.Cursor := crDefault;
+    Application.OnException := frmMain.ExceptionHandler;
+    Cancel := True;
+    if frmMain.IdFTP.Connected then
+      frmMain.IdFTP.Quit;
+    frmMain.cmdCancel.Caption := 'Close';
+    exit;
+  end;
+
   frmMain.ggeAll.MaxValue := DirList.Count + FileList.Count;
   frmMain.ggeItem.MaxValue := DirList.Count;