Merge "Check for a NULL pointer, do not call Build."