Added support for icomania and added some more error handling