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

.
Merge branch 'master' of github.com:FEI-Lithicon/reverse-users-formula