added heartbeats to all error conditions