Fixing two "aborts".