Improve behaviour on improper API use