Fixed error with empty heartbeats