Fix for empty site name return command framing problem