avoid astyanax null pointer exceptions
Merge branch 'master' of github.com:deanhiller/playorm