Avoided some crashes, basic IP address detection capabilities