Mantle/Mantle — pull request #317 by robb (2014-04-24 13:12:10+00:00)
Title: Fix null pointer dereference

Closes #316