add null check and change error type
Merge pull request #2192 from k77ch7/GH-2050_on_master

Fix for issue 2050 on master: BigDecimal and nil multiplication