diff --git a/src/URI.cpp b/src/URI.cpp
index deb7155..200a746 100644
--- a/src/URI.cpp
+++ b/src/URI.cpp
@@ -47,7 +47,7 @@ URI::URI(string webroot, string reqpath) {
 		query = "";
 		queryinit = false;
 	}
-	if (webroot[webroot.length() - 1] == '/') {
+	if (webroot.length() >= 1 && webroot[webroot.length() - 1] == '/') {
 		webroot.erase(webroot.length() - 1);
 	}
 	reqpath = url_decode(reqpath);
diff --git a/src/client.cpp b/src/client.cpp
index 97f93d8..5af1ad8 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -200,7 +200,7 @@ bool connection_handler(const char *preprefix, const char *col1, const char *col
 						req.redirect(303, "https://www.necronda.net/");
 					} else if (socket->getSocketPort() != 443) {
 						req.redirect(303, "https://" + host + req.getPath());
-					} else if (getWebRoot(host) == "") {
+					} else if (getWebRoot(host).empty()) {
 						req.redirect(303, "https://www.necronda.net" + req.getPath());
 					} else {
 						redir = false;