Fixed PHP warnings generated by trying to access non-existent fields in  and presaving empty values