Removed dead file reference
Added null check to prevent null reference exception
Merge pull request #26 from benhenderson/master

Fixed build error and null reference exception