Merge "Check null pointer agressively."