Removed exceptions and changed default connection port

Change-Id: I7754d4d9e1cb108d4ce93556628c92ba31e659d7