1 files changed, 10 insertions, 3 deletions
diff --git a/sandbox/wjaniszewski/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TupleTypeHelper.java b/sandbox/wjaniszewski/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TupleTypeHelper.java
index 3b5b30ac4d..324cd736ab 100644
--- a/sandbox/wjaniszewski/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TupleTypeHelper.java
+++ b/sandbox/wjaniszewski/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TupleTypeHelper.java
@@ -23,6 +23,8 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.tuscany.sca.binding.erlang.impl.exceptions.ErlangException;
+
 import com.ericsson.otp.erlang.OtpErlangObject;
 import com.ericsson.otp.erlang.OtpErlangTuple;
 
@@ -42,7 +44,8 @@ public class TupleTypeHelper implements TypeHelper {
 				OtpErlangObject member = TypeHelpersProxy.toErlang(args);
 				tupleMembers.add(member);
 			} catch (Exception e) {
-				// TODO Auto-generated catch block
+				// TODO: declaring toErlang method with Exception and throwing
+				// this?
 				e.printStackTrace();
 			}
 		}
@@ -57,8 +60,12 @@ public class TupleTypeHelper implements TypeHelper {
 		OtpErlangTuple tuple = (OtpErlangTuple) object;
 		Field[] fields = forClass.getFields();
 		if (fields.length != tuple.arity()) {
-			// TODO: received tuple with different element count - wrong
-			// message, exception!
+			throw new ErlangException(
+					"Received tuple with different element count ("
+							+ tuple.arity() + ") than expected ("
+							+ fields.length + ")");
+			// FIXME: JUnit this - received tuple with different element count -
+			// wrong message, exception!
 		}
 		result = forClass.newInstance();
 		for (int i = 0; i < tuple.arity(); i++) {