Refactored code. Remember, always check nully first!
Merge remote-tracking branch 'origin/master'