Re-queue on error
closes #1