Trying to fix null pointers in timeout manager