Don't throw NPE
Remove currency from propagated constraints
Elaine's changes