Lesson 6: NPE fix and simple perfomance test