NullPointerException non-determinism removed