Updated (completed?) error handling

updated binary