JCR-2086: Prevent a NPE on long running tx