diff --git a/src/main/java/com/yelp/model/parameters/AutoCompleteParameters.java b/src/main/java/com/yelp/model/parameters/AutoCompleteParameters.java
index f3d06e4..95b52f0 100644
--- a/src/main/java/com/yelp/model/parameters/AutoCompleteParameters.java
+++ b/src/main/java/com/yelp/model/parameters/AutoCompleteParameters.java
@@ -33,12 +33,12 @@ public class AutoCompleteParameters implements Parameters {
     private Double longitude;
     private Locale locale;
 
-    public String getParameters() throws Exception {
-        StringBuilder builder = new StringBuilder();
+    public String getParameters() throws NullParameterException {
+        StringBuilder builder = new StringBuilder("?");
         if (text == null) {
             throw new NullParameterException("text cannot be null for /autocomplete endpoint.");
         }
-        builder.append("&text=").append(text);
+        builder.append("text=").append(text);
 
         if (latitude != null) {
             builder.append("&latitude=").append(String.valueOf(latitude));
diff --git a/src/main/java/com/yelp/model/parameters/BusinessMatchesParameters.java b/src/main/java/com/yelp/model/parameters/BusinessMatchesParameters.java
index dbd24bb..0ebf6c5 100644
--- a/src/main/java/com/yelp/model/parameters/BusinessMatchesParameters.java
+++ b/src/main/java/com/yelp/model/parameters/BusinessMatchesParameters.java
@@ -22,6 +22,7 @@
 
 package com.yelp.model.parameters;
 
+import com.yelp.services.YelpApi;
 import lombok.Data;
 
 import com.yelp.exception.InvalidParameterException;
@@ -48,7 +49,7 @@ public class BusinessMatchesParameters implements Parameters {
     private Integer limit;
     private String matchThreshold;
 
-    public String getParameters() throws Exception {
+    public String getParameters() throws NullParameterException, InvalidParameterException {
         StringBuilder builder = new StringBuilder("?");
 
         if (StringUtils.isBlank(name)) {
@@ -86,7 +87,7 @@ public String getParameters() throws Exception {
         if (latitude != null) {
             if (latitude < -90 || latitude > 90) {
                 throw new InvalidParameterException("Please input the correct parameter value for latitude in " +
-                        "/businesses/matches endpoint.");
+                        YelpApi.BUSINESSES_MATCHES_ENDPOINT + " endpoint.");
             }
             builder.append("&latitude=").append(latitude);
         }
@@ -94,7 +95,7 @@ public String getParameters() throws Exception {
         if (longitude != null) {
             if (longitude < -180 || longitude > 180) {
                 throw new InvalidParameterException("Please input the correct parameter value for longitude in " +
-                        "/businesses/matches endpoint.");
+                        YelpApi.BUSINESSES_MATCHES_ENDPOINT + " endpoint.");
             }
             builder.append("&longitude=").append(longitude);
         }
@@ -114,7 +115,7 @@ public String getParameters() throws Exception {
         if (limit != null) {
             if (limit > 10) {
                 throw new InvalidParameterException("Please input the correct parameter value for limit in " +
-                        "/businesses/matches endpoint.");
+                        YelpApi.BUSINESSES_MATCHES_ENDPOINT + " endpoint.");
             }
             builder.append("&limit=").append(limit);
         }
diff --git a/src/main/java/com/yelp/model/parameters/BusinessSearchParameters.java b/src/main/java/com/yelp/model/parameters/BusinessSearchParameters.java
index b213e67..0b1d9e6 100644
--- a/src/main/java/com/yelp/model/parameters/BusinessSearchParameters.java
+++ b/src/main/java/com/yelp/model/parameters/BusinessSearchParameters.java
@@ -48,7 +48,7 @@ public class BusinessSearchParameters implements Parameters {
     private Integer openAt;
     private List<Attribute> attributes;
 
-    public String getParameters() throws Exception {
+    public String getParameters() throws NullParameterException, InvalidParameterException {
         StringBuilder builder = new StringBuilder("?");
 
         if (!StringUtils.isBlank(term)) {
diff --git a/src/main/java/com/yelp/model/parameters/BusinessSearchPhoneParameters.java b/src/main/java/com/yelp/model/parameters/BusinessSearchPhoneParameters.java
index f3959da..36042a7 100644
--- a/src/main/java/com/yelp/model/parameters/BusinessSearchPhoneParameters.java
+++ b/src/main/java/com/yelp/model/parameters/BusinessSearchPhoneParameters.java
@@ -24,6 +24,7 @@
 
 import com.yelp.exception.NullParameterException;
 
+import com.yelp.services.YelpApi;
 import lombok.Data;
 
 import org.apache.commons.lang3.StringUtils;
@@ -33,11 +34,12 @@ public class BusinessSearchPhoneParameters implements Parameters {
     private String phone;
 
     @Override
-    public String getParameters() throws Exception {
+    public String getParameters() throws NullParameterException {
         StringBuilder builder = new StringBuilder("?");
 
         if (StringUtils.isBlank(phone)) {
-            throw new NullParameterException("Phone cannot be null for /businesses/search/phone endpoint.");
+            throw new NullParameterException("Phone cannot be null for " + YelpApi.BUSINESSES_SEARCH_PHONE_ENDPOINT
+                    + " endpoint.");
         }
         builder.append("phone=").append(phone);
 
diff --git a/src/main/java/com/yelp/model/parameters/Parameters.java b/src/main/java/com/yelp/model/parameters/Parameters.java
index 6a79e11..16c4656 100644
--- a/src/main/java/com/yelp/model/parameters/Parameters.java
+++ b/src/main/java/com/yelp/model/parameters/Parameters.java
@@ -22,10 +22,13 @@
 
 package com.yelp.model.parameters;
 
+import com.yelp.exception.InvalidParameterException;
+import com.yelp.exception.NullParameterException;
+
 import java.util.List;
 
 public interface Parameters {
-    String getParameters() throws Exception;
+    String getParameters() throws NullParameterException, InvalidParameterException;
 
     default <E> String getParameterValues(List<E> list) {
         StringBuilder builder = new StringBuilder();