fix/cleanup some error paths when identifiers are missing