Final fix null socket