Itercept and compensate empty/bad fields (rev. 20)

Signed-off-by: nixnodes <code@eth.si>