Cosmetic changes - better print info/error

Change-Id: Ia3fe0c3ba43ebc80c9babd735322bce7b323c8dd