Fix some NULL handle warnings

Kills the slight delay when quitting, finally.

-[Unknown]