addPort fails occassionally...do better exception handling
6 files changed