better errors reporting and m2e support