BUG FIX - Validations (oops!)

Change-Id: I9a920bc83e64327c20e22501756c2d2906b8d039
Signed-off-by: Matthias Steiner <matthias.steiner@inscope.net>