Added case for nil return