Prevented where haspeople from causing a NPE"
Added new Class type to test.