Handle split failures better