quick fix to exception thrown when remote entities are not present