Add error handling of mismatched versions back in