Fixed a null pointer exception

Also, updated to 0.7.1