Added some checks for builders to enforce terminating them