I haven't hit the NPE yet so I didn't address that part.