Rinnegatamante Fixed some potential crashing issues.

Latest commit ac04820

Mar 3, 2018