Prevent Null Pointers

Also fix some minor javadoc and method name issues which will probably
prevent confusion in the future.