diff --git a/hdr/sqlite_modern_cpp.h b/hdr/sqlite_modern_cpp.h
index 09665d38..69db4189 100644
--- a/hdr/sqlite_modern_cpp.h
+++ b/hdr/sqlite_modern_cpp.h
@@ -28,11 +28,16 @@ namespace sqlite {
 
 	template<class T, bool Name = false>
 	struct index_binding_helper {
+		using Index = std::conditional_t<Name, const char *, int>;
+
 		index_binding_helper(const index_binding_helper &) = delete;
-#if __cplusplus < 201703 || _MSVC_LANG <= 201703
+//#if __cplusplus < 201703 || _MSVC_LANG // && _MSVC_LANG <= 201703
 		index_binding_helper(index_binding_helper &&) = default;
-#endif
-		typename std::conditional<Name, const char *, int>::type index;
+//#endif
+		index_binding_helper(Index index_, T value_) :
+			index(index_), value(value_) { }
+
+		Index index;
 		T value;
 	};
 
diff --git a/hdr/sqlite_modern_cpp/errors.h b/hdr/sqlite_modern_cpp/errors.h
index 14501dd7..6af48d78 100644
--- a/hdr/sqlite_modern_cpp/errors.h
+++ b/hdr/sqlite_modern_cpp/errors.h
@@ -48,7 +48,7 @@ namespace sqlite {
 				case SQLITE_ ## NAME: switch(error_code) {          \
 					derived                                           \
 					case SQLITE_ ## NAME:                             \
-					default: throw name(error_code, sql);             \
+					default: throw name(error_code, sql, errmsg);     \
 				}
 
 #if SQLITE_VERSION_NUMBER < 3010000