Add connection icons, handleError cases in one method