diff --git a/THANKS.in b/THANKS.in
index b35c4381..5db38471 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -220,3 +220,4 @@ Matthias Flacke
 Emil Michles
 Ask Bjoern Hansen
 Enrico Scholz
+Jason Martin
diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh
index 02ca1114..56962e37 100755
--- a/plugins-scripts/check_oracle.sh
+++ b/plugins-scripts/check_oracle.sh
@@ -118,9 +118,11 @@ fi
 # Last resort
 [ -z "$ORACLE_HOME" -a -d $PROGPATH/oracle ] && ORACLE_HOME=$PROGPATH/oracle
 
-if [ -z "$ORACLE_HOME" -o ! -d "$ORACLE_HOME" ] ; then
-	echo "Cannot determine ORACLE_HOME for sid $2"
-	exit $STATE_UNKNOWN
+if [ "$cmd" != "--db" ]; then
+	if [ -z "$ORACLE_HOME" -o ! -d "$ORACLE_HOME" ] ; then
+		echo "Cannot determine ORACLE_HOME for sid $2"
+		exit $STATE_UNKNOWN
+	fi
 fi
 PATH=$PATH:$ORACLE_HOME/bin
 LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ORACLE_HOME/lib