diff --git a/.gitignore b/.gitignore
index 9ad1779db82734378aaf9270e2e23cda951dd0dd..292a94413c18e6fffc849505a7d5ca03e6dcea8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 HELP.md
 target/
+out/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
 !**/src/test/**/target/
diff --git a/src/pizzeria/PizzaStore.java b/src/pizzeria/PizzaStore.java
index 38b89ecb152b3fca004f7de5253b3efeb55fc63f..8fb564e836f409a2d82a0d725106f882d17ca1b0 100644
--- a/src/pizzeria/PizzaStore.java
+++ b/src/pizzeria/PizzaStore.java
@@ -6,11 +6,17 @@ public abstract class PizzaStore {
  
 	public final Pizza orderPizza(String type) {
 		Pizza pizza = createPizza(type);
-		System.out.println("--- Making a " + pizza.getName() + " ---");
-		pizza.prepare();
-		pizza.bake();
-		pizza.cut();
-		pizza.box();
+
+		if (pizza != null) {
+			System.out.println("--- Making a " + pizza.getName() + " ---");
+			pizza.prepare();
+			pizza.bake();
+			pizza.cut();
+			pizza.box();
+		} else {
+			System.out.println("There is no such pizza like " + type);
+		}
+
 		return pizza;
 	}
 }
diff --git a/src/pizzeria/PizzaStoreModule.java b/src/pizzeria/PizzaStoreModule.java
index 28eaec935e34be92f52594f77a49418fe628a3c9..f3027405bea20b1d7fe5ee9c663e21b524565a6d 100644
--- a/src/pizzeria/PizzaStoreModule.java
+++ b/src/pizzeria/PizzaStoreModule.java
@@ -8,6 +8,7 @@ public class PizzaStoreModule extends AbstractModule {
 	protected void configure() {
 		bind(PizzaStore.class)
 			//.to(ChicagoPizzaStore.class);
-			.to(NYPizzaStore.class);
+			//.to(NYPizzaStore.class);
+			.to(TestPizzaStore.class);
 	}
 }
diff --git a/src/pizzeria/PizzaTestDrive.java b/src/pizzeria/PizzaTestDrive.java
index 3698d99ee50b058783200bb7cd25bc1419881cd8..9f2b87d28082c16e706b569fff206ecd80ef57f2 100644
--- a/src/pizzeria/PizzaTestDrive.java
+++ b/src/pizzeria/PizzaTestDrive.java
@@ -13,7 +13,9 @@ public class PizzaTestDrive {
 
 		for (int j = 0; j < pizzaType.length; j++) {
 			Pizza pizza = franchise.orderPizza(pizzaType[j]);
-			System.out.println("Customer ordered a " + pizza.getName() + "\n");
+			if (pizza != null) {
+				System.out.println("Customer ordered a " + pizza.getName() + "\n");
+			}
 		}
 	}
 }