#81 Replicated NPE as suggested by @krzyk