Added null checks