using the latest and greatest
I think I do now.
Fixed NPE.