Finally got Switchboard error handling in some sort of sane state and with tests