Clearer error message
Removed irrelevant crypto code