Fixed Piotr's report on null pointer to WAVES when CONFIG ERROR