Better panic message from add