diff --git a/src/lcd/i2clcd_private.h b/src/lcd/i2clcd_private.h
new file mode 100644
index 00000000..0137eb41
--- /dev/null
+++ b/src/lcd/i2clcd_private.h
@@ -0,0 +1,34 @@
+/*
+ * Author: Wouter van Verre <wouter.van.verre@intel.com>
+ * Copyright (c) 2015 Intel Corporation.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#pragma once
+
+#define UPM_CHECK_MRAA_SUCCESS(ret, msg)                                         \
+    if ((ret) != MRAA_SUCCESS) {                                                 \
+        throw std::runtime_error(std::string(__PRETTY_FUNCTION__) + ": " + msg); \
+    }
+
+#define UPM_GOTO_ON_MRAA_FAIL(ret, target) \
+    if ((ret) != MRAA_SUCCESS) {           \
+        goto target;                       \
+    }