VID-1638 Don't throw fatals