APP-209 temp solution to handle failure outcomes