fix: handle case where socket is none
Merge branch 'github'