--- javascript_aggregator.module.ORIG	2009-05-23 16:54:49.000000000 +0200
+++ javascript_aggregator.module	2009-06-04 16:20:12.000000000 +0200
@@ -83,7 +83,7 @@ function _javascript_aggregator_minify($
     // Strip out the aggregated JavaScript file.
     $path = base_path() . file_directory_path();
     $pattern = "!(<script type=\"text\/javascript\" src=\"$path)(.*?)(\"(.*?)><\/script>)!";
-    preg_match_all($pattern, $scripts, $matches);
+    if ( preg_match_all($pattern, $scripts, $matches) >= 1 ) { // if script tags found
     $aggregated_file = $matches[2][0];
     $jsmin_file = $aggregated_file .'min.js';
 
@@ -136,6 +136,7 @@ EOT;
 
     // Replace the aggregated file with the minified JavaScript file.
     $scripts = str_replace($aggregated_file, $jsmin_file, $scripts);
+    }
   }
   
   return $scripts;