Add additional null checks