bring back some more exception handling re-arrange some things, make the ip listing sooner