Removed superfluous check for required fields which was causing validation to fail, better error_msg handling to avoid duplicates