Fix typo and catch error

Ticket:	#6552