May as well move back the NameError from my testings...

Author: L'In20Cible

src/core/modules/messages/messages.h

@@ -90,6 +90,8 @@
 				if (field_descriptor && strcmp(field_descriptor->name().c_str(), field_name) == 0)
 					return field_descriptor;
 			}
+
+			BOOST_RAISE_EXCEPTION(PyExc_NameError, "Unable to find field '%s'.", field_name);
 			return NULL;
 		}
 
@@ -111,13 +113,7 @@
 			google::protobuf::Message* pMessage,
 			T (google::protobuf::Reflection::*get_field_delegate)(const google::protobuf::Message& message, const google::protobuf::FieldDescriptor* field) const,
 			const char* field_name)
-		{
-			const google::protobuf::FieldDescriptor* field_descriptor = GetFieldDescriptor(pMessage, field_name);
-			if (!field_descriptor)
-				BOOST_RAISE_EXCEPTION(PyExc_NameError, "Unable to find field '%s'.", field_name);
-
-			return (*pMessage->GetReflection().*get_field_delegate)(*pMessage, field_descriptor);
-		}
+		{ return (*pMessage->GetReflection().*get_field_delegate)(*pMessage, GetFieldDescriptor(pMessage, field_name)); }
 
 		static int32 GetInt32(google::protobuf::Message* pMessage, const char* field_name)
 		{ return GetField<int32>(pMessage, &google::protobuf::Reflection::GetInt32, field_name); }