Added null check; #66