dash fixes

null reference exception
Merge branch 'master' of https://github.com/JohnMai/Cmps112