Small error handling change. Will this help with the stack trace? Probably not...