Added null checks!