#81 Replicated NPE as suggested by @krzyk
#81 Fixed MethodValidator
#81 Fixed Checkstyle errors