Added error-into-message, work towards fixing add-hook-if-exists