Can you advise me on how to cater for both of those issues using the code posted ?

You can always use defined to check if an element is not undef, and do whatever you want with that information.