Fixed a stupid NRE and finished the raptor work to fix a dumb bug with #47.