Improved fault tolerance
Improved error msg
Added articles marked as deprecated