Avoid potential NPE / error stream contention + Move things around