Feature/check socket

n/t