Fix issue #1074, improve non-fatal error handling (#1075)