Index: build/cackey_win32_build/build.sh
==================================================================
--- build/cackey_win32_build/build.sh
+++ build/cackey_win32_build/build.sh
@@ -1,9 +1,9 @@
 #! /bin/bash
 
 make distclean
 
-./configure --with-pcsc-headers="$(pwd)/build/cackey_win32_build/include" --with-pcsc-libs="-L$(pwd)/build/cackey_win32_build/lib -lwinscard" --host=i586-mingw32msvc  CPPFLAGS="-I$(pwd)/build/cackey_win32_build/include" || exit 1
+./configure --with-pcsc-headers="$(pwd)/build/cackey_win32_build/include" --with-pcsc-libs="-L$(pwd)/build/cackey_win32_build/lib -lwinscard" --host=i586-mingw32msvc  CPPFLAGS="-I$(pwd)/build/cackey_win32_build/include" "$@" || exit 1
 
 make || exit 1
 
 exit 0

Index: cackey.c
==================================================================
--- cackey.c
+++ cackey.c
@@ -2874,10 +2874,19 @@
 				cackey_mark_slot_reset(slot);
 				slot->token_flags = CKF_LOGIN_REQUIRED;
 
 				return(CACKEY_PCSC_E_NEEDLOGIN);
 			}
+
+			if (respcode == 0x6E00) {
+				CACKEY_DEBUG_PRINTF("Got \"WRONG CLASS\", this means we are talking to the wrong object (likely because the card went away) -- resetting");
+
+				cackey_mark_slot_reset(slot);
+				slot->token_flags = CKF_LOGIN_REQUIRED;
+
+				return(CACKEY_PCSC_E_NEEDLOGIN);
+			}
 
 			if (send_ret == CACKEY_PCSC_E_TOKENABSENT) {
 				CACKEY_DEBUG_PRINTF("Token absent.  Returning TOKENABSENT");
 
 				cackey_mark_slot_reset(slot);
@@ -3071,11 +3080,11 @@
 	/* PIV authentication uses a "key_reference" of 0x80 */
 	pcsc_identities = cackey_read_certs(slot, NULL, &num_certs);
 	if (num_certs > 0 && pcsc_identities != NULL) {
 		switch (pcsc_identities[0].id_type) {
 			case CACKEY_ID_TYPE_PIV:
-				CACKEY_DEBUG_PRINTF("We recently had a PIV card, so we will attempt to authenticate using the PIV Application key reference");
+				CACKEY_DEBUG_PRINTF("We have PIV card, so we will attempt to authenticate using the PIV Application key reference");
 
 				key_reference = 0x80;
 				break;
 			default:
 				break;