Update grammar
Handle null in Constants
Just trying to get things done...