Catch NPE just in case