#396 Fixed connection not found handling