This fixes a segfault on startup. Also remove a commented-out and completely unused variable.
Attach a file by drag & drop or click to upload
