Fixing syntax error from rebasing
refactoring our many unknown errors into one place