fix for wallet persistence and fix for NPE on /trader command