Add error msg stubs, moar additions