Added more useful warning messages