Better param checking