Raise a proper exception on timeout. Fix #26