Try to fail less on yanking (refs #52)