diff --git a/lib/import/exchange/folder.rb b/lib/import/exchange/folder.rb
index d3bb540db..0a785c6ef 100644
--- a/lib/import/exchange/folder.rb
+++ b/lib/import/exchange/folder.rb
@@ -56,7 +56,9 @@ module Import
         parent = parent.id if parent.respond_to?(:id) # type coercion
         @connection.folders(root: parent)
       rescue Viewpoint::EWS::EwsFolderNotFound => e
-        logger.warn(e) && return
+        logger.warn("Try to get children folders of: #{parent.inspect}")
+        logger.warn(e)
+        nil
       end
     end
   end
diff --git a/lib/import/helper/attributes_examples.rb b/lib/import/helper/attributes_examples.rb
index 587ea1bff..d362d1709 100644
--- a/lib/import/helper/attributes_examples.rb
+++ b/lib/import/helper/attributes_examples.rb
@@ -48,7 +48,7 @@ module Import
         @no_new_counter += 1
 
         # check max 50 entries with no or no new attributes in a row
-        @enough_examples = @no_new_counter != 50
+        @enough = @no_new_counter != 50
 
         false
       end