BI-353
Throw an exception instead of having a NPE