A couple more strict parameter checks