Some better Not_found handling in catalogs and load_model.