Fix defs, readme
Error handling