Reverted NPE protection.