Add more expected exceptions