fixed NPE in signmarket
fixed signmarket & locker Exceptions on reload
Merge branch 'master' into stable