Fixes for umbra assert

Also added additional safeguards against roosting.