diff --git a/java-retail/samples/interactive-tutorials/user_import_data_to_catalog.sh b/java-retail/samples/interactive-tutorials/user_import_data_to_catalog.sh
index 05c2747db801..57d86329e33c 100644
--- a/java-retail/samples/interactive-tutorials/user_import_data_to_catalog.sh
+++ b/java-retail/samples/interactive-tutorials/user_import_data_to_catalog.sh
@@ -14,23 +14,36 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# set the key as GOOGLE_APPLICATION_CREDENTIALS
-export GOOGLE_APPLICATION_CREDENTIALS=~/key.json
+{
+	# set the key as GOOGLE_APPLICATION_CREDENTIALS
+	export GOOGLE_APPLICATION_CREDENTIALS=~/key.json
 
-# Change the working directory
-cd ~/cloudshell_open/java-retail/samples/interactive-tutorials/ || exit
+	# Change the working directory
+	cd ~/cloudshell_open/java-retail/samples/interactive-tutorials/ || exit
 
-# Run the sample for creating the GCS bucket and extract the output of that execution
-output=$(mvn compile exec:java -Dexec.mainClass="product.setup.ProductsCreateGcsBucket")
+	# Run the sample for creating the GCS bucket and extract the output of that execution
+	output=$(mvn compile exec:java -Dexec.mainClass="product.setup.ProductsCreateGcsBucket")
 
-# Get the bucket name and store it in the env variable BUCKET_NAME
-temp="${output#*gcs bucket }"
-bucket_name="${temp% was created*}"
-export BUCKET_NAME=$bucket_name
+	# Get the bucket name and store it in the env variable BUCKET_NAME
+	temp="${output#*gcs bucket }"
+	bucket_name="${temp% was created*}"
+	export BUCKET_NAME=$bucket_name
 
-# Import products to the Retail catalog
-mvn compile exec:java -Dexec.mainClass="product.ImportProductsGcs"
+	# Import products to the Retail catalog
+	mvn compile exec:java -Dexec.mainClass="product.ImportProductsGcs"
 
-echo "====================================="
-echo "Your Retail catalog is ready to use!"
-echo "====================================="
+} && {
+
+   # Print success message
+   echo "====================================="
+   echo "Your Retail catalog is ready to use!"
+   echo "====================================="
+
+ } || {
+
+   # Print error message
+   echo "====================================="
+   echo "Your Retail catalog wasn't created! Please fix the errors above!"
+   echo "====================================="
+   
+ }