diff --git a/DSP_API/CMakeLists.txt b/DSP_API/CMakeLists.txt
index 6f71681..d4bf16a 100644
--- a/DSP_API/CMakeLists.txt
+++ b/DSP_API/CMakeLists.txt
@@ -7,7 +7,7 @@ set(CMAKE_SYSTEM_VERSION gnu)
 set(CMAKE_VERBOSE_MAKEFILE ON)
 
 ## Setting up the four types of builds we have
-set(CMAKE_CONFIGURATION_TYPES "ThumbDV_Debug;ThumbDV_Release" CACHE STRING "" FORCE)
+set(CMAKE_CONFIGURATION_TYPES "ThumbDV_Debug;ThumbDV_Release;Test_Dongle" CACHE STRING "" FORCE)
 
 include_directories(.)
 include_directories(include)
@@ -57,7 +57,22 @@ if (CMAKE_BUILD_TYPE MATCHES ThumbDV_Release)
             -MP
             -MF
             )
-
+elseif(CMAKE_BUILD_TYPE MATCHES Test_Dongle)
+    target_compile_options(thumbdv PRIVATE
+            -U_FORTIFY_SOURCE
+            -O3
+            #-mcpu=cortex-a8
+            #-mfpu=neon
+            #-mfloat-abi=softfp
+            -ftree-vectorize
+            -Wall
+            -c
+            -fmessage-length=0
+            -lpthread
+            -MMD
+            -MP
+            -MF
+            )
 elseif(CMAKE_BUILD_TYPE MATCHES ThumbDV_Debug)
     target_compile_options(thumbdv PRIVATE
             -O0
diff --git a/DSP_API/ThumbDV/thumbDV.c b/DSP_API/ThumbDV/thumbDV.c
index 70d93b2..7c81aa2 100644
--- a/DSP_API/ThumbDV/thumbDV.c
+++ b/DSP_API/ThumbDV/thumbDV.c
@@ -676,10 +676,18 @@ static void _connectSerial( FT_HANDLE * ftHandle )
     do {
 
         status = FT_CreateDeviceInfoList(&numDevs);
+        if (status != FT_OK)
+        {
+            output("Unable to create Device Info \n");
+        }
 
         devInfo = (FT_DEVICE_LIST_INFO_NODE *) safe_malloc(sizeof(FT_DEVICE_LIST_INFO_NODE) * numDevs);
 
         status = FT_GetDeviceInfoList(devInfo, &numDevs);
+        if (status != FT_OK)
+        {
+            output("Unable to fetch Device Info \n");
+        }
 
         for ( i = 0 ; i < numDevs ; i++ )
         {