does this work as quick and dirty npe fix for this: https://gist.github.com/Slind14/6d3fbe603140bb74696b ???
updated decencies to be able to compile