1.1 --- a/Server/MainForm.Hid.cs	Wed Sep 02 12:54:07 2015 +0200
     1.2 +++ b/Server/MainForm.Hid.cs	Wed Sep 02 16:02:24 2015 +0200
     1.3 @@ -279,7 +279,15 @@
     1.4          /// </summary>
     1.5          private void HandleEject()
     1.6          {
     1.7 -            SafeFileHandle handle = OpenVolume(((MainForm)this).OpticalDriveToEject());
     1.8 +            string drive = ((MainForm)this).OpticalDriveToEject();
     1.9 +            if (drive.Length!=2)
    1.10 +            {
    1.11 +                //Not a proper drive spec.
    1.12 +                //Probably 'None' selected.
    1.13 +                return;
    1.14 +            }
    1.15 +
    1.16 +            SafeFileHandle handle = OpenVolume(drive);
    1.17              if (handle.IsInvalid)
    1.18              {
    1.19                  return;