Added More Null Checks