Log Message: Update to 1.22 Upstream changes: 1.22 2021-02-22 09:42:18 rurban - add try/catch by Tom Wyant