Fixed the null issue
Reverted a delete
Merge branch 'fixingProblems' into revertingDeletion