Don't log if it's null
Better bucket logging