-error handling (will be done until new year)

Alex