Whoops, handle a missing org properly again.