Improved error handling
Fix Feed Sign