App compatibility fix + some error handling.