caught nilerror. look no time to fix it beautifully, sorry.
Merge branch 'hotfix/nilerror'