This makes it much clearer what the method options are, what options are being passed and removes the amount of code required.

Also improved error handling on startup.