Fixed validation of objects upon save