diff --git a/src/main/java/tk/draganczuk/url/Routes.java b/src/main/java/tk/draganczuk/url/Routes.java
index 8a6dd99..521d955 100644
--- a/src/main/java/tk/draganczuk/url/Routes.java
+++ b/src/main/java/tk/draganczuk/url/Routes.java
@@ -18,17 +18,15 @@ public class Routes {
 
 	public static String addUrl(Request req, Response res) {
 		var body = req.body();
-		if (body.endsWith(";")) {
-			body = body + "$";
-		}
 		var split = body.split(";");
-
 		String longUrl = split[0];
-		
-		if (split[1].equals("$")) {
-			split[1] = Utils.randomString();
+
+		String shortUrl;
+		try {
+			shortUrl = split[1];
+		} catch (ArrayIndexOutOfBoundsException e) {
+			shortUrl = Utils.randomString();
 		}
-		String shortUrl = split[1];
 
 		if (Utils.validate(shortUrl)) {
 			return urlRepository.addUrl(longUrl, shortUrl);