Add more informative return statuses