merge in error handling stuff