diff --git a/build/core/add-application.mk b/build/core/add-application.mk
index a909c62..984585b 100644
--- a/build/core/add-application.mk
+++ b/build/core/add-application.mk
@@ -174,16 +174,15 @@
 ifndef APP_STL
     APP_STL := system
 else
+    ifneq ($(filter $(APP_STL),gnustl_static gnustl_shared stlport_static stlport_shared),)
+        $(call __ndk_error,APP_STL $(APP_STL) is no longer supported. Please \
+            switch to either c++_static or c++_shared. See \
+            https://developer.android.com/ndk/guides/cpp-support.html for more \
+            information.)
+    endif
     $(call ndk-stl-check,$(APP_STL))
 endif
 
-ifneq ($(filter $(APP_STL),gnustl_static gnustl_shared stlport_static stlport_shared),)
-    $(call __ndk_error,APP_STL $(APP_STL) is no longer supported. Please \
-        switch to either c++_static or c++_shared. See \
-        https://developer.android.com/ndk/guides/cpp-support.html for more \
-        information.)
-endif
-
 # wrap.sh files can be specified in the user's Application.mk in either an
 # ABI-generic (APP_WRAP_SH) or ABI-specific (APP_WRAP_SH_x86, etc) fashion.
 # These two approaches cannot be combined; if any ABI-specific wrap.sh files are