diff --git a/agent/bin/datasid-network-usage.sh b/agent/bin/datasid-network-usage.sh
index cb6344df297dbf1f1145dc84b14e5e2ffc8cf5a2..9d329952c35b90ddc5c2033f9d33f76b1a2095e2 100755
--- a/agent/bin/datasid-network-usage.sh
+++ b/agent/bin/datasid-network-usage.sh
@@ -77,10 +77,10 @@ PREVIOUS_TRAFFIC="${DATADIR}/previous"
 
 exec >> ${LOGFILE} 2>&1
 
-date +"%F %T - Start of netmon execution."
+date +"%F %T - Start of network usage execution."
 
 # Check if telecentroInfo is configured
-if test -e ${CONFDIR}/telecentroInfo; then
+if ! test -f ${CONFDIR}/telecentroInfo; then
 	date +"%F %T - telecentroInfo not found in ${CONFDIR}/telecentroInfo, waiting configuration."
 	exit 8
 fi
@@ -109,5 +109,5 @@ if elapsedTime && test -d "${PREVIOUS_TRAFFIC}"; then
 	
 fi
 
-date +"%F %T - netmon terminated successfully."
+date +"%F %T - network usage terminated successfully."
 exit 0
diff --git a/agent/network-scripts/net-collected-data/bandwidth-usage.tree b/agent/network-scripts/net-collected-data/bandwidth-usage.tree
index 7d57c60ece4f6fd960d9c8fc2ae1acd5ea6d3969..2baf63835dd725a3360b250637a2b53958d12518 100755
--- a/agent/network-scripts/net-collected-data/bandwidth-usage.tree
+++ b/agent/network-scripts/net-collected-data/bandwidth-usage.tree
@@ -84,7 +84,7 @@ function xml_data_generator()
             else
                 INTERVALID=$(cut -d" " -f1 <<< $line)
 
-                if test $COUNT -eq $INTERVALID -a $COUNT -lt 288; then
+                if test $COUNT -lt 288; then
                     xml_print
                     COUNT=$((${COUNT} + 1))
                     increment_time
@@ -102,10 +102,15 @@ function xml_data_generator()
 # ------------------------------------------------------------------------------
 
 # set PREFIX
-export PREFIX="$(readlink -f "$(dirname $0)/../")"
+export PREFIX="$(readlink -f "$(dirname $0)/../../")"
 
 # run datasid-common.sh
-source "$(readlink -f "$(dirname $0)")/datasid-common.sh" || exit 1
+source "$(readlink -f "$(dirname $0)/../..")/bin/datasid-common.sh" || exit 1
+
+if test -z "${PREFIX}"; then
+    date +"%F %T - ERROR: Prefix not set."
+    exit 2
+fi
 
 if test -z "${PREFIX}"; then
     date +"%F %T - ERROR: Prefix not set."
@@ -124,7 +129,8 @@ test -d ${TRAFFICS} || exit 0
 # Call the function xml_data_generator to generate the data to XML
 for TRAFFIC in $(ls -r ${TRAFFICS})
 do
-	if test -s $TRAFFIC; then 
-		xml_data_generator
-	fi
+    TRAFFIC="${TRAFFICS}/${TRAFFIC}"
+    if test -s ${TRAFFIC}; then
+        xml_data_generator
+    fi        
 done