Increased catchup time and removed option application
Added a catch for NullPointerException, seems to get thrown a lot when the host is annoyed with our device