Keep alive error message update

Resolves #1084

#1337oss