Created by: hannob
This prevents undefined index notices introduced by the changes for issue #642 (closed)