PROBCORE-621 Hack to try and avoid null pointer exception. BUT THIS NEEDS TO BE FIXED!!!