Better error messages and new pck