Updated the error message to be a little more clear, fixed a problem with the 011-heartbeat.t test. (manchicken)