diff --git a/doCheckout.go b/doCheckout.go
index 03904e8..4c30d5a 100644
--- a/doCheckout.go
+++ b/doCheckout.go
@@ -173,6 +173,10 @@ func rillCheckoutMaster(repo *gitpb.Repo) error {
 		// repo is already on master
 		return nil
 	}
+	if repo.GetUserVersion() == "uerr" {
+		repo.CheckoutMaster()
+		return nil
+	}
 	if repo.GetUserVersion() != repo.GetDevelVersion() {
 		// don't switch branches if the user branch has uncommitted patches
 		return nil