LOW / Removed incorrect NullPointerException catch