diff --git a/contrib/semver/name.sh b/contrib/semver/name.sh
index d749d3f..9dbdca3 100644
--- a/contrib/semver/name.sh
+++ b/contrib/semver/name.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 # Get the branch name, removing any "/" characters from pull requests
-BRANCH=$(git symbolic-ref --short HEAD | tr -d "/" 2>/dev/null)
+BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null | tr -d "/")
 
 # Check if the branch name is not master
-if [ "$BRANCH" = "master" ]; then
+if [ "$BRANCH" = "master" ] || [ $? != 0 ]; then
   printf "yggdrasil"
   exit 0
 fi
diff --git a/contrib/semver/version.sh b/contrib/semver/version.sh
index 6eeffc5..c23abf4 100644
--- a/contrib/semver/version.sh
+++ b/contrib/semver/version.sh
@@ -16,6 +16,11 @@ PATCH=$(git rev-list $TAG..master --count --merges --grep="from $DEVELOPBRANCH"
 if [ $? != 0 ]; then
   PATCH=$(git rev-list HEAD --count 2>/dev/null)
 
+  if [ $? != 0 ]; then
+    printf 'unknown'
+    exit -1
+  fi
+
   printf 'v0.0.%d' "$PATCH"
   exit -1
 fi