Merge "Fixing NPE when checking locked state."