Improve Error Handling

[MaxStenklyft]

First run at this function did not include much in terms of helpful error handling. This would be helpful in tracking and opening new issues.