Fix nil pointer bugs

[coveralls]

Pull Request Test Coverage Report for Build 400

• 0 of 0 changed or added relevant lines in 0 files are covered.
• No unchanged relevant lines lost coverage.
• Overall coverage remained the same at 55.563%

---

Totals
Change from base Build 398:	0.0%
Covered Lines:	2342
Relevant Lines:	4215

---

💛 - Coveralls

[placer14]

This...already appears to be merged via 8c08e4ca407f2803d6e304654e4169bd015dc89f. Closing.