final fix for NullPointerException that affected a huge part of users