Never let heartbeat be set to None (Issue #15)