have decorator return function instead of null (previously was okay because function was stored in dictionary)
have decorator return function instead of null (previously was okay because function was stored in dictionary)

divmain/lightyear