diff --git a/Library/Homebrew/cmd/update-reset.sh b/Library/Homebrew/cmd/update-reset.sh
index 75a9062838..a54656058c 100644
--- a/Library/Homebrew/cmd/update-reset.sh
+++ b/Library/Homebrew/cmd/update-reset.sh
@@ -17,6 +17,7 @@ git() {
 }
 
 homebrew-update-reset() {
+  local option
   local DIR
   local -a REPOS=()
 
@@ -50,6 +51,11 @@ homebrew-update-reset() {
   for DIR in "${REPOS[@]}"
   do
     [[ -d "${DIR}/.git" ]] || continue
+    if ! git -C "${DIR}" config --local --get remote.origin.url &>/dev/null
+    then
+      opoo "No remote 'origin' in: ${DIR}"
+      continue
+    fi
     ohai "Fetching ${DIR}..."
     git -C "${DIR}" fetch --force --tags origin
     git -C "${DIR}" remote set-head origin --auto >/dev/null
diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh
index 6e6693c829..1ec6067f00 100644
--- a/Library/Homebrew/cmd/update.sh
+++ b/Library/Homebrew/cmd/update.sh
@@ -555,6 +555,11 @@ EOS
     [[ -d "${DIR}/.git" ]] || continue
     cd "${DIR}" || continue
 
+    if ! git config --local --get remote.origin.url &>/dev/null
+    then
+      opoo "No remote 'origin' in: ${DIR}"
+      continue
+    fi
     if [[ -n "${HOMEBREW_VERBOSE}" ]]
     then
       echo "Checking if we need to fetch ${DIR}..."
@@ -706,6 +711,11 @@ EOS
 
     [[ -d "${DIR}/.git" ]] || continue
     cd "${DIR}" || continue
+    if ! git config --local --get remote.origin.url &>/dev/null
+    then
+      # No need to display a (duplicate) warning here
+      continue
+    fi
 
     TAP_VAR="$(repo_var "${DIR}")"
     UPSTREAM_BRANCH_VAR="UPSTREAM_BRANCH${TAP_VAR}"