--- a/usr/src/cmd/tomcat/install-tomcat	Mon Mar 21 01:50:01 2011 -0800
+++ b/usr/src/cmd/tomcat/install-tomcat	Sat Apr 23 12:08:45 2011 -0700
@@ -20,17 +20,25 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)install-tomcat	1.22	10/04/22 SMI"
+#ident	"@(#)install-tomcat	1.23	11/03/17 SMI"
 
 # functions - search for "START HERE" to find start of control flow
 
 . ${SRC}/tools/install.subr
 
 install_tomcat() {
+    if [ ! -d ${USRTOMCAT} ]; then
+    	echo "${USRTOMCAT} does not exist or is not a directory."
+	exit 1
+    fi
     cd ${USRTOMCAT}
     rm -rf *
+    if [ ! -d ${VARTOMCAT} ]; then
+    	echo "${VARTOMCAT} does not exist or is not a directory."
+	exit 1
+    fi
     cd ${VARTOMCAT}
     rm -rf *