Syntax fixes and handle non-responses from external