#652420 by sun: Fixed Various failures everywhere caught by asserting on watchdog errors found in testing logs.