BUG FIX: null in UP not allowed