PLATFORM-392 Correct comments and cover off potential error