Implemented additional parameter checks.