Fixed null pointer error
Solved the mystery of the disappearing doc comments