removed possible npe
increased watchdog.interval to 16m
log naming convention