Overlay changes

Reviewers: @donovanhide, @ximinez, @rec
+1 to donovan's comment.  Connection errors are too important to just throw away.