Handle more error cases