Various safe guards
Tiny fix