fixes #6053 - delete organization raises 404