Improve #386

Improve #386 by raising warnings if wrong parameter is passed

Close #386