Handle null results better