Better crypto errors
Merge