diff --git a/HISTORY b/HISTORY
index c808a4f..648afcc 100755
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,6 @@
+Dec. 19 2015
+Improved error handling when defining a class in C
+
 Dec. 18 2015
 Avoided compiling issues
 Improved compatibility with Arduino
diff --git a/core/my_basic.c b/core/my_basic.c
index 5853fc8..15313d6 100755
--- a/core/my_basic.c
+++ b/core/my_basic.c
@@ -8204,6 +8204,10 @@ int mb_begin_class(struct mb_interpreter_t* s, void** l, const char* n, mb_value
 
 	running = s->running_context;
 
+	tmp = (_ls_node_t*)(*l);
+
+	_using_jump_set_of_structured(s, tmp, _exit, result);
+
 	tmp = _search_identifier_in_scope_chain(s, 0, n, 0, 0);
 	if(tmp && tmp->data) {
 		obj = (_object_t*)tmp->data;