Correct some mistakes from last commit. Also use slot_call to catch exceptions.