better error handling, now same as Connect
v0.3.0