Added A png and better error messages