Avoid dying if we don't have a pillar.
Cleaned up some stray whitespaces.