Bug fix for locked timer window & better unhandled error handling