Miscellaneous changes

- Reduced code length
- Populated a catch statement