some check against null was not necessary; added an additional test