add some check for mandatory fields

TODO
complete mandatory fields handler