Move error messages to new util module