Diagram: Fixed some NPEs