Tidy up, throw errors on action resolution