Fixes: Null pointer issue. This commit is an intermediate step to
debugging why the entire system is not working