checkNotNull added
removed checkNotNull