strengthen err handling from Basic Calls