Modified the error handling during initial set-up