I found it in a hymnal. Written in 1910 by L.B. Bridgers. Guest has the right words. There is a 4th verse, as follows:

Then as you travel on life's way,
Through waters deep, or billows' foam;
You may have Jesus as your stay,
He'll walk with you and lead you home.
O brother, will you let Him in?
He'll save and keep you free from sin,
Till heaven's door you enter in;
It won't be long, it may be soon.

After the last verse, there's a tag:

There'll be no sorrow there,
There'll be no sorrow there,
In heav'n above, where all is love,
There'll be no sorrow there,