diff --git a/android_popt.cc b/android_popt.cc
index a1492c6..b5b7970 100644
--- a/android_popt.cc
+++ b/android_popt.cc
@@ -98,7 +98,7 @@
 #ifdef LOCAL_DEBUG
     fprintf(stderr, "getopt_long()=%c\n", res);
 #endif
-    if (res == 0 || res == '?') {
+    if (res <= 0 || res == '?' || i == -1) {
         return -1;
     }