Minor updates

else: raise RuntimeError(...)