Improved error handling for hexapair