Meh

- Added some Null Checks
- Added Header