Check for null
Clean up warning