Maybe check for null (or missing) revid first, before passing it to a constructor?