diff --git a/platformio/__init__.py b/platformio/__init__.py
index 8ab34194..de870943 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (3, 2, "0b4")
+VERSION = (3, 2, "0b5")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/builder/tools/piolib.py b/platformio/builder/tools/piolib.py
index 5c238b21..14b81cbb 100644
--- a/platformio/builder/tools/piolib.py
+++ b/platformio/builder/tools/piolib.py
@@ -302,9 +302,14 @@ class LibBuilderBase(object):
         result = []
         for path in self._validate_search_paths(search_paths):
             try:
+                assert "+" in self.lib_ldf_mode
                 incs = self.env.File(path).get_found_includes(
                     self.env, LibBuilderBase.ADVANCED_SCANNER, tuple(inc_dirs))
-            except:  # pylint: disable=bare-except
+            except Exception as e:  # pylint: disable=broad-except
+                if self.verbose and "+" in self.lib_ldf_mode:
+                    sys.stderr.write(
+                        "Warning! Classic Pre Processor is used for `%s`, "
+                        "advanced has failed with `%s`\n" % (path, e))
                 incs = self.env.File(path).get_found_includes(
                     self.env, LibBuilderBase.CLASSIC_SCANNER, tuple(inc_dirs))
             # print path, map(lambda n: n.get_abspath(), incs)
diff --git a/platformio/managers/platform.py b/platformio/managers/platform.py
index cc985ca7..2f9c25f8 100644
--- a/platformio/managers/platform.py
+++ b/platformio/managers/platform.py
@@ -477,7 +477,7 @@ class PlatformBase(PlatformPackagesMixin, PlatformRunMixin):
             }
         if "tool-scons" not in self.packages:
             self.packages['tool-scons'] = {
-                "version": "~3.20501.1",
+                "version": "~3.20501.2",
                 "optional": False
             }