diff --git a/cmake/PreProjectConfig.cmake b/cmake/PreProjectConfig.cmake
index ce18d89d..f54da048 100644
--- a/cmake/PreProjectConfig.cmake
+++ b/cmake/PreProjectConfig.cmake
@@ -19,15 +19,15 @@ if(${OS_FSFW} STREQUAL linux AND TGT_BSP)
 		)
 	elseif (${TGT_BSP} MATCHES "arm/raspberrypi")
 		if(NOT DEFINED ENV{RASPBIAN_ROOTFS})
-			if(NOT RASPBIAN_ROOTFS)
+			if(NOT DEFINED RASPBIAN_ROOTFS)
+			    message(WARNING "No RASPBIAN_ROOTFS environmental or CMake variable set!")
 				set(ENV{RASPBIAN_ROOTFS} "$ENV{HOME}/raspberrypi/rootfs")
 			else()
 				set(ENV{RASPBIAN_ROOTFS} "${RASPBIAN_ROOTFS}")
 			endif()
 		else()	
 			message(STATUS 
-				"RASPBIAN_ROOTFS from environmental variables used: "
-				"$ENV{RASPBIAN_ROOTFS}"
+			    "RASPBIAN_ROOTFS from environmental variables used: $ENV{RASPBIAN_ROOTFS}"
 			)
 		endif()
 	
@@ -36,12 +36,8 @@ if(${OS_FSFW} STREQUAL linux AND TGT_BSP)
 				message(STATUS "No RASPBERRY_VERSION specified, setting to 4")
 				set(RASPBERRY_VERSION "4" CACHE STRING "Raspberry Pi version")
 			else()
-				message(STATUS 
-					"Setting RASPBERRY_VERSION to ${RASPBERRY_VERSION}"
-				)
-				set(RASPBERRY_VERSION 
-					${RASPBERRY_VERSION} CACHE STRING "Raspberry Pi version"
-				)
+				message(STATUS "Setting RASPBERRY_VERSION to ${RASPBERRY_VERSION}")
+				set(RASPBERRY_VERSION ${RASPBERRY_VERSION} CACHE STRING "Raspberry Pi version")
 			set(ENV{RASPBERRY_VERSION} ${RASPBERRY_VERSION})
 			endif()
 		else()