Fixed error handling in calls