Moved errors around to better support app errors and query param errors