Missed one update.  You will need to add an additional check at line 192 to deal with a false return or the data not being present.  That's not things getting out of hand; the code's ensuring that it has its dependencies and not just assuming it.