diff --git a/Les Horaires/src/main/java/com/amine/horaires/ShopSearch.java b/Les Horaires/src/main/java/com/amine/horaires/ShopSearch.java
index ae4f1d8..0935c04 100644
--- a/Les Horaires/src/main/java/com/amine/horaires/ShopSearch.java	
+++ b/Les Horaires/src/main/java/com/amine/horaires/ShopSearch.java	
@@ -34,14 +34,15 @@ public class ShopSearch extends OptionsActivity {
         loading = (RelativeLayout) findViewById(R.id.loading);
         Button searchButton = (Button) findViewById(R.id.searchAction);
 
-        // @todo form validation (empty ...)
         searchButton.setOnClickListener(new View.OnClickListener() {
 
             @Override
             public void onClick(View v) {
-                loading.setVisibility(View.VISIBLE);
-                SearchTask s = new SearchTask();
-                s.execute(Utils.generateUrlForTextLocation(name.getText().toString(), location.getText().toString()));
+                if (name.getText().toString().trim().length() > 0 && location.getText().toString().trim().length() > 0) {
+                    loading.setVisibility(View.VISIBLE);
+                    SearchTask s = new SearchTask();
+                    s.execute(Utils.generateUrlForTextLocation(name.getText().toString(), location.getText().toString()));
+                }
             }
         });