Proper return handling