diff --git a/node/lib/openshift-origin-node/model/v2_cart_model.rb b/node/lib/openshift-origin-node/model/v2_cart_model.rb
index 598bc199514..7155f07b5f7 100644
--- a/node/lib/openshift-origin-node/model/v2_cart_model.rb
+++ b/node/lib/openshift-origin-node/model/v2_cart_model.rb
@@ -380,8 +380,8 @@ def post_configure(cartridge_name)
         cartridge              = get_cartridge(name)
 
         ::OpenShift::Runtime::Utils::Cgroups.new(@container.uuid).boost do
-          if empty_repository?
-            output << "CLIENT_MESSAGE: An empty Git repository has been created for your application.  Use 'git push' to add your code." if cartridge.name == primary_cartridge.name
+          if cartridge.name == primary_cartridge.name and empty_repository?
+            output << "CLIENT_MESSAGE: An empty Git repository has been created for your application.  Use 'git push' to add your code."
           else
             output << start_cartridge('start', cartridge, user_initiated: true)
           end