Merge "Fail more gracefully on version mismatch"