Merge "Handle null stacks gracefully." into klp-dev