Resolves infinite loop error introduced in 997606b.
Whether you entered yes or no to the "more entries" dialog, you'd still be in the loop. Also, we now check to see if the custom domain is blank