BUGFIX correct check address NPE