this is the actual only change needed .. the above are just optimizations to prevent method calls that will just return null anyway.