Merge "Fix NPE in sample code." into klp-dev