Added parsing checks and default values insertion on errors
Minor upd