Fixed a client crash with the new builder tool