Even more cleaning
Handle some exceptions and improve output about unsupported ones