I recently committed a fix for Bug #513379, which is related. In this fix, basically, we default the cluster name to "cluster1", which should avoid *most* situations where the cluster name is blank (except for places where users intentionally blank the cluster name, which still might need to be solved). Feel free to reopen this bug report if you do not feel that this sufficiently solves the issue.
I recently committed a fix for Bug #513379, which is related. In this fix, basically, we default the cluster name to "cluster1", which should avoid *most* situations where the cluster name is blank (except for places where users intentionally blank the cluster name, which still might need to be solved). Feel free to reopen this bug report if you do not feel that this sufficiently solves the issue.