Added a fix for a NPE in AbstractModelObject and suppressed a worked-around FindBugs warning