Improved error handling
Renamed checksum to fingerprint