Add guard against null release id when we need it