(v1.0.3) Improved error messaging