Null and Transient constraint fix