Remove unnecesary check for null id after 16cb52117 is merged