Fix NullPointerException from Unchecked Null Returns

Method returns null without null-safety checks, causing NPE in production.