Improve user feedback

Change-Id: If83ba0b9f2c8fa10bea3269c3ed6d1dc6611bfc8