Version 0.4.0: better error resiliency