diff --git a/Android.mk b/Android.mk
index 9b83ce2..0937a0f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,6 +2,8 @@
 LOCAL_MODULE := rubberband
 LOCAL_MODULE_FILENAME := librubberband
 
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/rubberband $(LOCAL_PATH)/rubberband/src
+
 RUBBERBAND_PATH := rubberband
 RUBBERBAND_SRC_PATH := $(RUBBERBAND_PATH)/src
 
diff --git a/src/dsp/FFT.cpp b/src/dsp/FFT.cpp
index 7142093..1ff4dd4 100644
--- a/src/dsp/FFT.cpp
+++ b/src/dsp/FFT.cpp
@@ -3174,7 +3174,11 @@ FFT::FFT(int size, int debugLevel) :
     if (!d) {
         std::cerr << "FFT::FFT(" << size << "): ERROR: implementation "
                   << impl << " is not compiled in" << std::endl;
+#ifndef NO_EXCEPTIONS
         throw InvalidImplementation;
+#else
+        abort();
+#endif
     }
 }