Crash fix, small adjustments #48

Closed mmangliers closed 9 years ago