Bug fix where issue raised when first_name nil