Fixes to resolve some crashes in the application.

We're always interested in hearing your feedback, so if you have any please email us at [email protected]