michael: temporary fix for nullpointer exceptions