Fixes error node appearances

Change-Id: I5ce8ad5a8f988d1d10bcdcf72a51203c4bf81ebe
Merge "Fixes error node appearances"