Bug: Added null-check if field is empty (to avoid NP-exception).