Initital step towards better error-handling for insufficient connections