remove warning and check if entry is null