Fix  new interface and error handling

See title