better errors in master