Changed invalid id to null