Revert "Added IP being set."

This reverts commit 46ac4bea684fe848ae255e6047ca6b932261586d.
Revert to Before Unhandled exceptions