Store connection ID if passed
Add missing line break