add !=null verification