Added returns to exit out when errors have been encountered

Added returns to exit out when errors have been encountered so that callbacks aren't fired twice.