diff --git a/src/manager.cpp b/src/manager.cpp
index 89727e6..1a68898 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -252,7 +252,8 @@
                 throw InvalidArgument();
             }
 
-            if (((std::abs(attrValue - lowerBound)) % scalarIncrement) != 0)
+            if (scalarIncrement == 0 ||
+                ((std::abs(attrValue - lowerBound)) % scalarIncrement) != 0)
             {
                 lg2::error(
                     "((std::abs({ATTR_VALUE} - {LOWER_BOUND})) % {SCALAR_INCREMENT}) != 0",
diff --git a/src/password.cpp b/src/password.cpp
index 5231120..f780cc5 100644
--- a/src/password.cpp
+++ b/src/password.cpp
@@ -35,7 +35,7 @@
 
 bool Password::isMatch(const std::array<uint8_t, maxHashSize>& expected,
                        const std::array<uint8_t, maxSeedSize>& seed,
-                       const std::string rawData, const std::string algo)
+                       const std::string& rawData, const std::string& algo)
 {
     lg2::error("isMatch");