Merge "Fix NullPointerException." into qt-dev