+ update error message to new merge-in-cadd approach
+ update error message to new merge-in-cadd approach

  - make a more usefule error message when things fail

indraniel/yaps2,indraniel/yaps2,indraniel/yaps2