minor selector exception improvements