Added more info, error checking