(v1.0.2) Improved error messaging