closes #25
add some missing rescues for non v2 orgs
merged