fix another crash and port new changes in supplemental to 1243, 1281 & 1282 #79

Closed
Juby210 wants to merge 6 commits from (deleted):patch-4 into master

6 commits