Removed useless NPE security.