diff --git a/FindSignalView.cmake b/FindSignalView.cmake
index 1c00106..c1e4168 100644
--- a/FindSignalView.cmake
+++ b/FindSignalView.cmake
@@ -4,11 +4,11 @@ if(NOT SIGNALVIEW_IS_EXTERNAL_PROJECT)
   set(SIGNALVIEW_LIBRARY_DIR "" CACHE PATH "The path to the library of an libsignalview installation")
 
   set(_search_paths "")
-  if(EXISTS SIGNALVIEW_INCLUDE_DIR)
+  if(SIGNALVIEW_INLCUDE_DIR AND EXISTS ${SIGNALVIEW_INCLUDE_DIR})
     list(APPEND _search_paths ${SIGNALVIEW_INCLUDE_DIR})
   endif()
-  if(EXISTS SIGNALVIEW_PREFIX)
-    list(APPEND _search_paths ${SIGNALVIEW_PREFIX}/include)
+  if(SIGNALVIEW_PREFIX AND EXISTS ${SIGNALVIEW_PREFIX})
+    list(APPEND _search_paths "${SIGNALVIEW_PREFIX}/include")
   endif()
   find_path(
     SIGNALVIEW_INCLUDE_DIRS
@@ -16,15 +16,15 @@ if(NOT SIGNALVIEW_IS_EXTERNAL_PROJECT)
     PATHS ${_search_paths})
 
   set(_search_paths "")
-  if(EXISTS SIGNALVIEW_LIBRARY_DIR)
+  if(SIGNALVIEW_LIBRARY_DIR AND EXISTS ${SIGNALVIEW_LIBRARY_DIR})
     list(APPEND _search_paths ${SIGNALVIEW_LIBRARY_DIR})
   endif()
-  if(EXISTS SIGNALVIEW_PREFIX)
-    list(APPEND _search_paths ${SIGNALVIEW_PREFIX}/lib)
+  if(SIGNALVIEW_PREFIX AND EXISTS ${SIGNALVIEW_PREFIX})
+    list(APPEND _search_paths "${SIGNALVIEW_PREFIX}/lib")
   endif()
   find_library(
     SIGNALVIEW_LIBRARIES
-    NAMES fsp
+    NAMES signalview
     PATHS ${_search_paths})
   unset(_search_paths)