fix more exceptions
add timeout waiting for partner address