Adding extra checks for Illegal Argument Exception from market