Merge "Revert "Avoid NPE under stress conditions""