diff --git a/dahdi_handle_device b/dahdi_handle_device
index 6f60f5b..d475511 100755
--- a/dahdi_handle_device
+++ b/dahdi_handle_device
@@ -35,16 +35,6 @@ if [ "$DAHDI_UDEV_DISABLE_DEVICES" = 'yes' ]; then
 	exit 0
 fi
 
-# Check if we can safely do our job
-if [ ! -f /sys/module/dahdi/parameters/auto_assign_spans ]; then
-	echo "Old driver (no auto_assign_spans parameter). Skip $DEVPATH" | $LOGGER
-	exit 0
-fi
-if [ `cat /sys/module/dahdi/parameters/auto_assign_spans` -eq 1 ]; then
-	echo "auto_assign_spans=1. Skip $DEVPATH" | $LOGGER
-	exit 0
-fi
-
 # Can we pass a different value so we can use
 # alternate (testing) configuration?
 # Meanwhile, make it hard-coded.
@@ -54,6 +44,19 @@ export DAHDICONFDIR
 case "$ACTION" in
 add)
 	echo "$ACTION: $DEVPATH" | $LOGGER
+
+	# Check if we can safely do our job
+	if [ ! -f /sys/module/dahdi/parameters/auto_assign_spans ]; then
+		if [ -f /sys/module/dahdi ]; then
+			$LOGGER "Old driver (no auto_assign_spans parameter). Skip $DEVPATH"
+			exit 0
+		fi
+	fi
+	if [ `cat /sys/module/dahdi/parameters/auto_assign_spans` -eq 1 ]; then
+		echo "auto_assign_spans=1. Skip $DEVPATH" | $LOGGER
+		exit 0
+	fi
+
 	# Can have alternate dahdi configuration directory for debugging
 	# export DAHDICONFDIR="/tmp/xortel/dahdi"
 
diff --git a/dahdi_span_config b/dahdi_span_config
index 614c6a6..bde20fb 100755
--- a/dahdi_span_config
+++ b/dahdi_span_config
@@ -25,17 +25,6 @@ set -e
 
 #echo >&2 "$0($ACTION): DEBUG($# args): '$*'"
 
-# Old driver. These scripts probably won't work anyway.
-if [ ! -f /sys/module/dahdi/parameters/auto_assign_spans ]; then
-	$LOGGER "Old driver (no auto_assign_spans parameter). Skip $DEVPATH"
-	exit 0
-fi
-
-if [ $(cat /sys/module/dahdi/parameters/auto_assign_spans) -eq 1 ]; then
-	$LOGGER "auto_assign_spans=1. Skip $DEVPATH"
-	exit 0
-fi
-
 # Do we have a configuration?
 if [ -f /etc/dahdi/init.conf ]; then
 	. /etc/dahdi/init.conf
@@ -94,6 +83,20 @@ configure_span() {
 case "$ACTION" in
 add)
 	echo "$ACTION: $DEVPATH" | $LOGGER
+
+	# Old driver. These scripts probably won't work anyway.
+	if [ ! -f /sys/module/dahdi/parameters/auto_assign_spans ]; then
+		if [ -f /sys/module/dahdi ]; then
+			$LOGGER "Old driver (no auto_assign_spans parameter). Skip $DEVPATH"
+			exit 0
+		fi
+	fi
+
+	if [ $(cat /sys/module/dahdi/parameters/auto_assign_spans) -eq 1 ]; then
+		$LOGGER "auto_assign_spans=1. Skip $DEVPATH"
+		exit 0
+	fi
+
 	# Can have alternate dahdi configuration directory for debugging
 	# export DAHDICONFDIR="/tmp/xortel/dahdi"