Added empty handling in structure validator

Signed-off-by: Tom Wright <tom@inflatablecookie.com>