* ensure wait throws error when needed, that fixes #1