diff --git a/configure.ac b/configure.ac
index 9fe3c201..4fb4deda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,8 +62,9 @@ AM_CPPFLAGS="$AM_CPPFLAGS $PARSER_CFLAGS"
 LIBS="$LIBS $PARSER_LIBS"
 
 ### Check for libstrophe dependencies
-AC_CHECK_LIB([resolv], [__res_query], [],
-    [AC_MSG_ERROR([libresolv is required for profanity])])
+AC_CHECK_LIB([resolv], [res_query], [],
+    [AC_CHECK_LIB([resolv], [__res_query], [],
+        [AC_MSG_ERROR([libresolv is required for profanity])])])
 PKG_CHECK_MODULES([openssl], [openssl], [],
     [AC_MSG_ERROR([openssl is required for profanity])])
 AM_CPPFLAGS="$AM_CPPFLAGS $openssl_CFLAGS"
diff --git a/src/ui/window.c b/src/ui/window.c
index 370f876c..a74479d8 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -326,8 +326,10 @@ win_handle_error_message(ProfWin *window, const char * const from,
         case WIN_DUCK:
         case WIN_CONSOLE:
             handled =  FALSE;
+            break;
         case WIN_MUC:
             handled = _muc_handle_error_message(window, from, err_msg);
+            break;
         default:
             assert(FALSE);
             break;