User-friendly messaging added.