added handling for API breakage