#214 fixing abundant null checks

fixed..
Perhaps Uppercase constants?