Preventing nullpointering related to obanyc-2145