Added more malformed parameter checks