Added safe checks