some additional null checking