I just followed the existing code… but I don't think NonFatal is really needed here. Shall I leave it in or remove it?