Fix typo
Add more abort cases