diff --git a/package-lock.json b/package-lock.json
index 3ca06cc..b9ca3fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "sineql",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "sineql",
-      "version": "0.5.2",
+      "version": "0.5.3",
       "license": "ISC",
       "devDependencies": {
         "jest": "^27.5.1"
diff --git a/package.json b/package.json
index c6531c3..4fdf59f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sineql",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "A simple to use graphQL clone",
   "main": "source/index.js",
   "scripts": {
diff --git a/source/index.js b/source/index.js
index 8886489..609606a 100644
--- a/source/index.js
+++ b/source/index.js
@@ -23,8 +23,8 @@ const sineQL = (schema, { queryHandlers, createHandlers, updateHandlers, deleteH
 			//parse the query
 			const tokens = parseInput(reqBody, true, options);
 
+			//check for leading keywords (create, update, delete)
 			switch(tokens[0]) {
-				//check for leading keywords
 				case 'create': {
 					if (!createHandlers) {
 						return [405, 'Create handlers not implemented'];
@@ -36,9 +36,20 @@ const sineQL = (schema, { queryHandlers, createHandlers, updateHandlers, deleteH
 
 					const createTree = parseCreateTree(tokens, typeGraph, options);
 
-					const result = await createHandlers[tokens[1]](createTree, typeGraph);
+					try {
+						const result = await createHandlers[tokens[1]](createTree, typeGraph);
 
-					return [200, result];
+						if (options.debug) {
+							console.log('Create tree results:');
+							console.dir(result, { depth: null });
+						}
+	
+						return [200, result];
+					}
+					catch(e) {
+						console.error('Create error:', e);
+						return [400, e];
+					}
 				}
 
 				case 'update': {
@@ -52,9 +63,20 @@ const sineQL = (schema, { queryHandlers, createHandlers, updateHandlers, deleteH
 
 					const updateTree = parseUpdateTree(tokens, typeGraph, options);
 
-					const result = await updateHandlers[tokens[1]](updateTree, typeGraph);
+					try {
+						const result = await updateHandlers[tokens[1]](updateTree, typeGraph);
 
-					return [200, result];
+						if (options.debug) {
+							console.log('Update tree results:');
+							console.dir(result, { depth: null });
+						}
+	
+						return [200, result];
+					}
+					catch(e) {
+						console.error('Update error:', e);
+						return [400, e];
+					}
 				}
 
 				case 'delete': {
@@ -68,9 +90,20 @@ const sineQL = (schema, { queryHandlers, createHandlers, updateHandlers, deleteH
 
 					const deleteTree = parseDeleteTree(tokens, typeGraph, options);
 
-					const result = await deleteHandlers[tokens[1]](deleteTree, typeGraph);
+					try {
+						const result = await deleteHandlers[tokens[1]](deleteTree, typeGraph);
 
-					return [200, result];
+						if (options.debug) {
+							console.log('Delete tree results:');
+							console.dir(result, { depth: null });
+						}
+	
+						return [200, result];
+					}
+					catch(e) {
+						console.error('Delete error:', e);
+						return [400, e];
+					}
 				}
 
 				//no leading keyword - regular query
@@ -85,19 +118,25 @@ const sineQL = (schema, { queryHandlers, createHandlers, updateHandlers, deleteH
 
 					const queryTree = parseQueryTree(tokens, typeGraph, options);
 
-					const result = await queryHandlers[queryTree.typeName](queryTree, typeGraph);
+					try {
+						const result = await queryHandlers[queryTree.typeName](queryTree, typeGraph);
 
-					if (options.debug) {
-						console.log('Query tree results:');
-						console.dir(result, { depth: null });
+						if (options.debug) {
+							console.log('Query tree results:');
+							console.dir(result, { depth: null });
+						}
+	
+						return [200, result];
+					}
+					catch(e) {
+						console.error('Query error:', e);
+						return [400, e];
 					}
-
-					return [200, result];
 				}
 			}
 		}
 		catch(e) {
-			console.error('Error:', e);
+			console.error('Input error:', e);
 			return [400, e];
 		}
 	};