diff --git a/credentials/ITGlueApi.credentials.ts b/credentials/ITGlueApi.credentials.ts
index 757a131..c106b70 100644
--- a/credentials/ITGlueApi.credentials.ts
+++ b/credentials/ITGlueApi.credentials.ts
@@ -3,11 +3,16 @@ import {
 		ICredentialTestRequest,
 		ICredentialType,
 		INodeProperties,
-} from 'n8n-workflow';
+		type Icon,
+	} from 'n8n-workflow';
 
 export class ITGlueApi implements ICredentialType {
 	name = 'itglueApi';
 	displayName = 'IT Glue API';
+	icon: Icon = {
+		light: 'file:itglue.svg',
+		dark: 'file:itglue-dark.svg',
+	};
 	documentationUrl = 'https://github.com/redanthrax/itglue-node';
 	properties: INodeProperties[] = [
 		{
diff --git a/credentials/itglue-dark.svg b/credentials/itglue-dark.svg
new file mode 100644
index 0000000..5a77e0b
--- /dev/null
+++ b/credentials/itglue-dark.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 191.43 42.3"><title>ITGlue-logo</title><path d="M63.17,46.76H55.7a1,1,0,0,1-1-1.12V6.41a1,1,0,0,1,1-1.06h7.47a1,1,0,0,1,1.06,1.06V45.65A1.07,1.07,0,0,1,63.17,46.76Z" transform="translate(-4.29 -4.85)"/><path d="M98.28,13.21h-9V45.65a1.12,1.12,0,0,1-1.11,1.12h-7.3a1.12,1.12,0,0,1-1.12-1.12V13.21H70.64a1.07,1.07,0,0,1-1.11-1.06V6.41a1.07,1.07,0,0,1,1.11-1.06H98.28a1.12,1.12,0,0,1,1.17,1.06v5.74A1.12,1.12,0,0,1,98.28,13.21Z" transform="translate(-4.29 -4.85)"/><path d="M129.6,46.32a63.45,63.45,0,0,1-11.09.84c-7,0-14.44-4.57-14.44-17.34V22.35C104.07,8.81,111.88,5,119,5a64.16,64.16,0,0,1,10.59.78c.5.06.95.28.95.84V9.36c0,.39-.22.56-.73.56h-.22c-3.29-.28-5.85-.39-10.59-.39-5.18,0-9.87,2.79-9.87,12.82v7.47c0,9.2,4.18,12.82,9.36,12.82,3.4,0,5.68-.22,7-.33V26.36a1,1,0,0,1,1-1.12h3a1.11,1.11,0,0,1,1.06,1.12V45.09A1.2,1.2,0,0,1,129.6,46.32Z" transform="translate(-4.29 -4.85)"/><path d="M139,46.76h-2.9a1.06,1.06,0,0,1-1-1.12V5.91a1,1,0,0,1,1-1.06H139a1,1,0,0,1,1,1.06V45.65A1.06,1.06,0,0,1,139,46.76Z" transform="translate(-4.29 -4.85)"/><path d="M166.38,46.76H163.6a1.07,1.07,0,0,1-1.06-1.12V44.59a16.79,16.79,0,0,1-8.86,2.56C147,47.15,144,43,144,35.56V17.22a1.12,1.12,0,0,1,1.11-1.11h2.67a1.12,1.12,0,0,1,1.12,1.11V35.56c0,5.63,1.89,7.36,6.13,7.36a17.64,17.64,0,0,0,7.52-2.17V17.22a1.16,1.16,0,0,1,1.12-1.11h2.73a1.11,1.11,0,0,1,1.06,1.11V45.65A1.07,1.07,0,0,1,166.38,46.76Z" transform="translate(-4.29 -4.85)"/><path d="M194.66,33H176v.78c0,6.63,2.62,9.09,7.75,9.09a76.3,76.3,0,0,0,9.92-.61h.28a.79.79,0,0,1,.89.78v1.89c0,.72-.22,1.12-1.12,1.28a50.53,50.53,0,0,1-10,.95c-6.41,0-12.65-3-12.65-13.38v-5c0-8,4.4-13,12.37-13,8.14,0,12.26,5.13,12.26,13v3C195.71,32.49,195.32,33,194.66,33Zm-3.9-4.24c0-6.3-2.4-8.75-7.3-8.75S176,22.74,176,28.76v.5h14.77Z" transform="translate(-4.29 -4.85)"/><path d="M44.9,41.12,26.5,12.81H18.81l17.6,27.44H9.73V21.54L4.29,13.12V43.25a3.19,3.19,0,0,0,.79,2.12A2.6,2.6,0,0,0,7,46.26H43a2.74,2.74,0,0,0,2.51-1.86A3.25,3.25,0,0,0,44.9,41.12Z" transform="translate(-4.29 -4.85)"/><path d="M5.08,10,23.48,38.3h7.69L13.57,10.86H40.26V29.57L45.7,38V7.85a3.19,3.19,0,0,0-.8-2.12A2.61,2.61,0,0,0,43,4.85H7A2.74,2.74,0,0,0,4.49,6.7,3.24,3.24,0,0,0,5.08,10Z" transform="translate(-4.29 -4.85)"/></svg>
\ No newline at end of file
diff --git a/credentials/itglue.svg b/credentials/itglue.svg
new file mode 100644
index 0000000..5a77e0b
--- /dev/null
+++ b/credentials/itglue.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 191.43 42.3"><title>ITGlue-logo</title><path d="M63.17,46.76H55.7a1,1,0,0,1-1-1.12V6.41a1,1,0,0,1,1-1.06h7.47a1,1,0,0,1,1.06,1.06V45.65A1.07,1.07,0,0,1,63.17,46.76Z" transform="translate(-4.29 -4.85)"/><path d="M98.28,13.21h-9V45.65a1.12,1.12,0,0,1-1.11,1.12h-7.3a1.12,1.12,0,0,1-1.12-1.12V13.21H70.64a1.07,1.07,0,0,1-1.11-1.06V6.41a1.07,1.07,0,0,1,1.11-1.06H98.28a1.12,1.12,0,0,1,1.17,1.06v5.74A1.12,1.12,0,0,1,98.28,13.21Z" transform="translate(-4.29 -4.85)"/><path d="M129.6,46.32a63.45,63.45,0,0,1-11.09.84c-7,0-14.44-4.57-14.44-17.34V22.35C104.07,8.81,111.88,5,119,5a64.16,64.16,0,0,1,10.59.78c.5.06.95.28.95.84V9.36c0,.39-.22.56-.73.56h-.22c-3.29-.28-5.85-.39-10.59-.39-5.18,0-9.87,2.79-9.87,12.82v7.47c0,9.2,4.18,12.82,9.36,12.82,3.4,0,5.68-.22,7-.33V26.36a1,1,0,0,1,1-1.12h3a1.11,1.11,0,0,1,1.06,1.12V45.09A1.2,1.2,0,0,1,129.6,46.32Z" transform="translate(-4.29 -4.85)"/><path d="M139,46.76h-2.9a1.06,1.06,0,0,1-1-1.12V5.91a1,1,0,0,1,1-1.06H139a1,1,0,0,1,1,1.06V45.65A1.06,1.06,0,0,1,139,46.76Z" transform="translate(-4.29 -4.85)"/><path d="M166.38,46.76H163.6a1.07,1.07,0,0,1-1.06-1.12V44.59a16.79,16.79,0,0,1-8.86,2.56C147,47.15,144,43,144,35.56V17.22a1.12,1.12,0,0,1,1.11-1.11h2.67a1.12,1.12,0,0,1,1.12,1.11V35.56c0,5.63,1.89,7.36,6.13,7.36a17.64,17.64,0,0,0,7.52-2.17V17.22a1.16,1.16,0,0,1,1.12-1.11h2.73a1.11,1.11,0,0,1,1.06,1.11V45.65A1.07,1.07,0,0,1,166.38,46.76Z" transform="translate(-4.29 -4.85)"/><path d="M194.66,33H176v.78c0,6.63,2.62,9.09,7.75,9.09a76.3,76.3,0,0,0,9.92-.61h.28a.79.79,0,0,1,.89.78v1.89c0,.72-.22,1.12-1.12,1.28a50.53,50.53,0,0,1-10,.95c-6.41,0-12.65-3-12.65-13.38v-5c0-8,4.4-13,12.37-13,8.14,0,12.26,5.13,12.26,13v3C195.71,32.49,195.32,33,194.66,33Zm-3.9-4.24c0-6.3-2.4-8.75-7.3-8.75S176,22.74,176,28.76v.5h14.77Z" transform="translate(-4.29 -4.85)"/><path d="M44.9,41.12,26.5,12.81H18.81l17.6,27.44H9.73V21.54L4.29,13.12V43.25a3.19,3.19,0,0,0,.79,2.12A2.6,2.6,0,0,0,7,46.26H43a2.74,2.74,0,0,0,2.51-1.86A3.25,3.25,0,0,0,44.9,41.12Z" transform="translate(-4.29 -4.85)"/><path d="M5.08,10,23.48,38.3h7.69L13.57,10.86H40.26V29.57L45.7,38V7.85a3.19,3.19,0,0,0-.8-2.12A2.61,2.61,0,0,0,43,4.85H7A2.74,2.74,0,0,0,4.49,6.7,3.24,3.24,0,0,0,5.08,10Z" transform="translate(-4.29 -4.85)"/></svg>
\ No newline at end of file
diff --git a/nodes/ITGlue/ITGlue.node.ts b/nodes/ITGlue/ITGlue.node.ts
index 67fee88..c938b9c 100644
--- a/nodes/ITGlue/ITGlue.node.ts
+++ b/nodes/ITGlue/ITGlue.node.ts
@@ -46,7 +46,10 @@ export class ITGlue implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'IT Glue',
 		name: 'iTGlue',
-		icon: 'file:itglue.svg',
+		icon: {
+			light: 'file:itglue.svg',
+			dark: 'file:itglue-dark.svg',
+		},
 		group: ['transform'],
 		version: 1,
 		documentationUrl: 'https://github.com/redanthrax/itglue-node',
diff --git a/nodes/ITGlue/actions/organization/bulkUpdate/execute.ts b/nodes/ITGlue/actions/organization/bulkUpdate/execute.ts
index 78aef73..270d749 100644
--- a/nodes/ITGlue/actions/organization/bulkUpdate/execute.ts
+++ b/nodes/ITGlue/actions/organization/bulkUpdate/execute.ts
@@ -1,5 +1,10 @@
-import { IDataObject, IExecuteFunctions, INodeExecutionData } from "n8n-workflow";
-import { itglueRequest } from "../../../transport";
+import {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	NodeOperationError,
+} from 'n8n-workflow';
+import { itglueRequest } from '../../../transport';
 
 export async function bulkUpdateOrganizations(
 	this: IExecuteFunctions,
@@ -14,12 +19,16 @@ export async function bulkUpdateOrganizations(
 
 	try {
 		organizationsData = JSON.parse(organizations);
-	} catch (error) {
-		throw new Error('Invalid JSON format for organizations data');
+	} catch {
+		throw new NodeOperationError(this.getNode(), 'Invalid JSON format for organizations data', {
+			itemIndex: index,
+		});
 	}
 
 	if (!Array.isArray(organizationsData)) {
-		throw new Error('Organizations data must be an array');
+		throw new NodeOperationError(this.getNode(), 'Organizations data must be an array', {
+			itemIndex: index,
+		});
 	}
 
 	// Transform the data to IT Glue API format
diff --git a/nodes/ITGlue/actions/router.ts b/nodes/ITGlue/actions/router.ts
index 7a46359..e04acab 100644
--- a/nodes/ITGlue/actions/router.ts
+++ b/nodes/ITGlue/actions/router.ts
@@ -2,6 +2,9 @@ import {
 		IDataObject,
 		IExecuteFunctions,
 		INodeExecutionData,
+		type JsonObject,
+		NodeApiError,
+		NodeOperationError,
 } from 'n8n-workflow';
 
 import { ITGlue } from './interfaces';
@@ -298,8 +301,14 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
 				if (this.continueOnFail()) {
 						operationResult.push({ json: this.getInputData(i)[0].json, error: err, pairedItem: i });
 				} else {
-						if (err.context) err.context.itemIndex = i;
-						throw err;
+						if (err instanceof NodeApiError || err instanceof NodeOperationError) {
+							err.context.itemIndex = i;
+							throw err;
+						}
+
+						throw new NodeApiError(this.getNode(), err as JsonObject, {
+							itemIndex: i,
+						});
 				}
 		}
 	}
diff --git a/nodes/ITGlue/itglue-dark.svg b/nodes/ITGlue/itglue-dark.svg
new file mode 100644
index 0000000..5a77e0b
--- /dev/null
+++ b/nodes/ITGlue/itglue-dark.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 191.43 42.3"><title>ITGlue-logo</title><path d="M63.17,46.76H55.7a1,1,0,0,1-1-1.12V6.41a1,1,0,0,1,1-1.06h7.47a1,1,0,0,1,1.06,1.06V45.65A1.07,1.07,0,0,1,63.17,46.76Z" transform="translate(-4.29 -4.85)"/><path d="M98.28,13.21h-9V45.65a1.12,1.12,0,0,1-1.11,1.12h-7.3a1.12,1.12,0,0,1-1.12-1.12V13.21H70.64a1.07,1.07,0,0,1-1.11-1.06V6.41a1.07,1.07,0,0,1,1.11-1.06H98.28a1.12,1.12,0,0,1,1.17,1.06v5.74A1.12,1.12,0,0,1,98.28,13.21Z" transform="translate(-4.29 -4.85)"/><path d="M129.6,46.32a63.45,63.45,0,0,1-11.09.84c-7,0-14.44-4.57-14.44-17.34V22.35C104.07,8.81,111.88,5,119,5a64.16,64.16,0,0,1,10.59.78c.5.06.95.28.95.84V9.36c0,.39-.22.56-.73.56h-.22c-3.29-.28-5.85-.39-10.59-.39-5.18,0-9.87,2.79-9.87,12.82v7.47c0,9.2,4.18,12.82,9.36,12.82,3.4,0,5.68-.22,7-.33V26.36a1,1,0,0,1,1-1.12h3a1.11,1.11,0,0,1,1.06,1.12V45.09A1.2,1.2,0,0,1,129.6,46.32Z" transform="translate(-4.29 -4.85)"/><path d="M139,46.76h-2.9a1.06,1.06,0,0,1-1-1.12V5.91a1,1,0,0,1,1-1.06H139a1,1,0,0,1,1,1.06V45.65A1.06,1.06,0,0,1,139,46.76Z" transform="translate(-4.29 -4.85)"/><path d="M166.38,46.76H163.6a1.07,1.07,0,0,1-1.06-1.12V44.59a16.79,16.79,0,0,1-8.86,2.56C147,47.15,144,43,144,35.56V17.22a1.12,1.12,0,0,1,1.11-1.11h2.67a1.12,1.12,0,0,1,1.12,1.11V35.56c0,5.63,1.89,7.36,6.13,7.36a17.64,17.64,0,0,0,7.52-2.17V17.22a1.16,1.16,0,0,1,1.12-1.11h2.73a1.11,1.11,0,0,1,1.06,1.11V45.65A1.07,1.07,0,0,1,166.38,46.76Z" transform="translate(-4.29 -4.85)"/><path d="M194.66,33H176v.78c0,6.63,2.62,9.09,7.75,9.09a76.3,76.3,0,0,0,9.92-.61h.28a.79.79,0,0,1,.89.78v1.89c0,.72-.22,1.12-1.12,1.28a50.53,50.53,0,0,1-10,.95c-6.41,0-12.65-3-12.65-13.38v-5c0-8,4.4-13,12.37-13,8.14,0,12.26,5.13,12.26,13v3C195.71,32.49,195.32,33,194.66,33Zm-3.9-4.24c0-6.3-2.4-8.75-7.3-8.75S176,22.74,176,28.76v.5h14.77Z" transform="translate(-4.29 -4.85)"/><path d="M44.9,41.12,26.5,12.81H18.81l17.6,27.44H9.73V21.54L4.29,13.12V43.25a3.19,3.19,0,0,0,.79,2.12A2.6,2.6,0,0,0,7,46.26H43a2.74,2.74,0,0,0,2.51-1.86A3.25,3.25,0,0,0,44.9,41.12Z" transform="translate(-4.29 -4.85)"/><path d="M5.08,10,23.48,38.3h7.69L13.57,10.86H40.26V29.57L45.7,38V7.85a3.19,3.19,0,0,0-.8-2.12A2.61,2.61,0,0,0,43,4.85H7A2.74,2.74,0,0,0,4.49,6.7,3.24,3.24,0,0,0,5.08,10Z" transform="translate(-4.29 -4.85)"/></svg>
\ No newline at end of file
diff --git a/nodes/ITGlue/transport.ts b/nodes/ITGlue/transport.ts
index 8097e18..e22e39b 100644
--- a/nodes/ITGlue/transport.ts
+++ b/nodes/ITGlue/transport.ts
@@ -7,6 +7,7 @@ import {
 	IHttpRequestOptions,
 	ILoadOptionsFunctions,
 	IPollFunctions,
+	type JsonObject,
 	NodeOperationError,
 	NodeApiError,
 } from 'n8n-workflow';
@@ -56,7 +57,7 @@ export async function itglueRequest(
 				'Rate limit exceeded. IT Glue is throttling requests. Please try again later.',
 			);
 		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/package.json b/package.json
index 711f089..45373ae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-itglue",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "An n8n node to connect to IT Glue",
   "keywords": [
     "n8n-nodes-itglue",