Merge "Avoid NPE under stress conditions"