Caught a couple null pointers in Complete and Edit