Add extra checks for optional parameters and invalid flags (#857)

Add extra checks for optional parameters and invalid flags (#857) #430