Fixed: Issue #36 - Crash at shutdown