Fixed check for non-existing option