Added fix to catch null pointer in SOManager