Fixed print throwing null error.
Merge origin/master