Allow None as empty field
Signed-off-by: JohnMave126 <johnmave126@gmail.com>