Better error handling for GSD