Bug fix! Nullpointer exception.