BS-8503
Fix exception when adding timer