Feature/cash 150

This should return an IllegalArgumentException, not NullPointerException, as we discussed