Added tasty null checking