Fix a NullPointerException throwing during refactoring.

 Let the compiler the developer about the missing constant. This is related to #616, #612, and #530