6,madigan6: Fixed null pointer bug
6,madigan6: Pulled, fixed merge, now pushing prev changes