diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
index a66d9f15..b5f17029 100644
--- a/android/CMakeLists.txt
+++ b/android/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.10)  
 
 include_directories(../ios/src)
+include_directories(include/filament)
 include_directories(../ios/include)
-include_directories(../ios/include/stb)
 include_directories(src/main/cpp)
 link_directories(src/main/jniLibs/${ANDROID_ABI}) 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
@@ -18,11 +18,9 @@ add_library(polyvox_filament_android SHARED
 )
 
 add_library(FILAMENT_SHADERS SHARED 
-  "${CMAKE_CURRENT_SOURCE_DIR}/../ios/include/material/image.c"
+  "include/material/image.c"
 )
 
-include_directories(../ios/include)
-
 target_link_libraries(
   polyvox_filament_android
   FILAMENT_SHADERS
diff --git a/lib/filament_controller_ffi.dart b/lib/filament_controller_ffi.dart
index 38275e64..f9304825 100644
--- a/lib/filament_controller_ffi.dart
+++ b/lib/filament_controller_ffi.dart
@@ -142,6 +142,10 @@ class FilamentControllerFFI extends FilamentController {
         renderCallback,
         renderCallbackOwner);
 
+    if (_viewer!.address == 0) {
+      throw Exception("Failed to create viewer. Check logs for details");
+    }
+
     _lib.create_swap_chain_ffi(
         _viewer!, Pointer<Void>.fromAddress(surfaceAddress), width, height);
     if (nativeTexture != 0) {