Better error messages for Rapture