Added s2i_type_conversion for s2i messages and error handling