v0.2.1: major error handling improvements