Added List cleanup
Added error handling