Rescue association mismatches - closes #40