diff --git a/pgsql/Pgsql_Value.h b/pgsql/Pgsql_Value.h
index b27f7ca..31a7e61 100644
--- a/pgsql/Pgsql_Value.h
+++ b/pgsql/Pgsql_Value.h
@@ -48,7 +48,7 @@ namespace Pgsql {
 		{
 			if (m_val == nullptr) {
 				if (nullhandling == NullHandling::Throw)
-					throw std::runtime_error("Unexpected NULL value in array");
+					throw std::runtime_error("Unexpected NULL value for array");
 			}
 			else {
 				using value_type = E;
@@ -77,6 +77,8 @@ namespace Pgsql {
 		template <typename E, typename I>
 		void getAsArray(I insert_iter, const E &value_for_nulls) const
 		{
+			if (m_val == nullptr) return;
+
 			using value_type = E;
 			ArrayParser parser(m_val);
 			for (;;) {