Intent to backport to all maintenance branches: OAK-7289

[Julian Reschke]

https://issues.apache.org/jira/browse/OAK-7289

(potential NPE in well-intended exception handler)