More robust wrapping on itc availability