Test and account for nil case