Check for nil instead of stripping