LSF: Added if not NULL check around variable.
LSF: Added more test output to test
Merge pull request #632 from joakim-hove/LSF-fixup

Lsf fixup