null-checks

Null checks everywhere and airport security
· oop null-checks