Scout bugs with null pointer exceptions fixed