Move condition into sister branch check to avoid empty ref name

Move condition into sister branch check to avoid empty ref name #619