Fixed some error handling in Feeding