Remove validate from builder
Update message
add null check