Add some param checks