@@ -316,11 +316,15 @@ def converge(solo=false)
         # Check for cookbooks in the path given
         # Chef::Config[:cookbook_path] can be a string or an array
         # if it's an array, go through it and check each one, raise error at the last one if no files are found
-        Chef::Config[:cookbook_path].each_with_index do |cookbook_path, index|
-          if file_exists?(cookbook_path)
+        Chef::Log.fatal "BUGBUG: cookbook_path: #{Chef::Config[:cookbook_path]}"
+        Array(Chef::Config[:cookbook_path]).each_with_index do |cookbook_path, index|
+          if directory_not_empty?(cookbook_path)
+            Chef::Log.fatal "BUGBUG: cb path not empty: #{cookbook_path}"
             break
           else
-            (Chef::Log.fatal(e = "No cookbook found in #{Chef::Config[:cookbook_path].inspect}, make sure cookboook_path is set correctly."); (raise Chef::Exceptions::CookbookNotFound, e)) if is_last_element?(index, Chef::Config[:cookbook_path])
+            msg = "No cookbook found in #{Chef::Config[:cookbook_path].inspect}, make sure cookboook_path is set correctly."
+            Chef::Log.fatal(msg)
+            raise Chef::Exceptions::CookbookNotFound, msg if is_last_element?(index, Chef::Config[:cookbook_path])
           end
         end
       end
@@ -333,12 +337,12 @@ def converge(solo=false)
 
     private
 
-    def file_exists?(path)
-      (File.exists?(path) and Dir.entries(path).size > 2) ? true : false
+    def directory_not_empty?(path)
+      File.exists?(path) && (Dir.entries(path).size > 2)
     end
 
     def is_last_element?(index, object)
-      object.class == Array ? index == object.size - 1 : true 
+      object.kind_of?(Array) ? index == object.size - 1 : true 
     end  
 
   end