Separated error messages

Also changed the file hash to include the parsed variables rather than
the raw query string