Adding additional exception for conflict errors

Updated DigitallyBorn's pull request to provide more generic exception handling