Index: branches/cparm/Chameleon.xcodeproj/project.pbxproj
===================================================================
--- branches/cparm/Chameleon.xcodeproj/project.pbxproj	(revision 2156)
+++ branches/cparm/Chameleon.xcodeproj/project.pbxproj	(revision 2157)
@@ -500,7 +500,6 @@
 		ABBBFCFB15D55908002D7A1E /* ld_classic.1 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.man; path = ld_classic.1; sourceTree = "<group>"; };
 		ABD521F114F9197900B62550 /* utarray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utarray.h; sourceTree = "<group>"; };
 		ABD521F214F9197900B62550 /* uthash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uthash.h; sourceTree = "<group>"; };
-		ABD521F314F9197900B62550 /* uterror.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uterror.c; sourceTree = "<group>"; };
 		ABD9A1FC150F706A008DA465 /* CoreHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreHash.h; sourceTree = "<group>"; };
 		ABD9A1FF150F80C4008DA465 /* CoreHash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = CoreHash.c; sourceTree = "<group>"; };
 		ABE5FF4E14F9495500447F78 /* modules.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = modules.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
@@ -1239,7 +1238,6 @@
 				AB43B34014C37E520018D529 /* ufs_byteorder.h */,
 				ABD521F114F9197900B62550 /* utarray.h */,
 				ABD521F214F9197900B62550 /* uthash.h */,
-				ABD521F314F9197900B62550 /* uterror.c */,
 				AB43B34114C37E520018D529 /* vbe.c */,
 				AB43B34214C37E520018D529 /* vbe.h */,
 				AB43B34314C37E520018D529 /* xml.c */,
Index: branches/cparm/i386/libsaio/uterror.c
===================================================================
--- branches/cparm/i386/libsaio/uterror.c	(revision 2156)
+++ branches/cparm/i386/libsaio/uterror.c	(revision 2157)
@@ -1,16 +0,0 @@
-//
-//  uterror.c
-//  Chameleon
-//
-//  Created by cparm on 24/02/12.
-//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
-//
-
-#include "libsaio.h"
-
-
-jmp_buf uterror;
-
-void init_ut_fnc(void)
-{
-}
\ No newline at end of file
Index: branches/cparm/i386/libsaio/Makefile
===================================================================
--- branches/cparm/i386/libsaio/Makefile	(revision 2156)
+++ branches/cparm/i386/libsaio/Makefile	(revision 2157)
@@ -36,7 +36,7 @@
         xml.o md5.o device_tree.o modules.o \
         cpu.o platform.o \
         fake_efi.o \
-        convert.o acpi_tools.o smbios.o uterror.o lzss.o lib.o rtc.o time.o gen_uuid-uuid.o pack.o unpack.o CException.o
+        convert.o acpi_tools.o smbios.o lzss.o lib.o rtc.o time.o gen_uuid-uuid.o pack.o unpack.o CException.o
 
 # Options enabled by default:
 
Index: branches/cparm/i386/libsaio/CoreHash.h
===================================================================
--- branches/cparm/i386/libsaio/CoreHash.h	(revision 2156)
+++ branches/cparm/i386/libsaio/CoreHash.h	(revision 2157)
@@ -22,7 +22,7 @@
 static struct HObj * HObj##_FindStrVar(const char *name, struct HObj *container) {          \
     struct HObj *var;                                                                       \
                                                                                             \
-	if (setjmp(uterror) == -1) {                                                        \
+	if (setjmp(uterror) == -1) {															\
                                                                                             \
 		return NULL;                                                                        \
 	} else {                                                                                \
Index: branches/cparm/i386/libsaio/uthash.h
===================================================================
--- branches/cparm/i386/libsaio/uthash.h	(revision 2156)
+++ branches/cparm/i386/libsaio/uthash.h	(revision 2157)
@@ -57,7 +57,7 @@
 #define UTHASH_VERSION 1.9.6
 
 #ifndef uthash_fatal
-#define uthash_fatal(msg) longjmp(uterror,-1)        /* fatal error (out of memory,etc) */
+#define uthash_fatal(msg) Throw(-1)        /* fatal error (out of memory,etc) */
 #endif
 #ifndef uthash_malloc
 #define uthash_malloc(sz) malloc(sz)      /* malloc fcn                      */
Index: branches/cparm/i386/boot2/boot.c
===================================================================
--- branches/cparm/i386/boot2/boot.c	(revision 2156)
+++ branches/cparm/i386/boot2/boot.c	(revision 2157)
@@ -412,9 +412,7 @@
 #endif
 	printf("Starting Chameleon ...\n");
     
-	Install_Default_Handler();
-	
-	init_ut_fnc();
+	Install_Default_Handler();	
     
 	initBooterLog();
     
Index: branches/cparm/i386/modules/GUI/gui.c
===================================================================
--- branches/cparm/i386/modules/GUI/gui.c	(revision 2156)
+++ branches/cparm/i386/modules/GUI/gui.c	(revision 2157)
@@ -48,6 +48,8 @@
 
 static config_file_t    themeConfig;				           // theme.plist
 
+jmp_buf uterror;
+
 // CoreHash Declarations
 __CHNewStrVar(themeList_t)
 CHUnInit(themeList_t)