Fix error with locked timer adding & better handling of application restart